Revert 4547 "Isolate GYP target and .isolate files for tests"

As this breaks the FYI bots in 
http://build.chromium.org/p/chromium.webrtc.fyi/waterfall
due to different path to isolate.gypi (which cannot easily
be resolved due to limitations in GYP)

> Isolate GYP target and .isolate files for tests
> 
> Implemented according to the instructions at
> http://www.chromium.org/developers/testing/isolated-testing
> 
> Workflow has been like this:
> 1. create _run GYP target
> 2. create a stripped down .isolate file
> 3. export GYP_DEFINES="$GYP_DEFINES test_isolation_mode=check"
> 4. runhooks
> 5. compile
> 6. test if the test would run (i.e. find it's dependencies) without
>    actually executing it:
>    tools/swarm_client/isolate.py run --isolated out/Release/testname.isolated
> 7. If failing, run the fix_test_cases.py script like this:
>    tools/swarm_client/fix_test_cases.py --isolated out/Release/testname.isolated
> 
> All tests that run on the bots for WebRTC has got _run target
> and .isolate file created.
> 
> "Normal tests" that run fine on any machine:
> * audio_decoder_unittests
> * common_audio_unittests
> * common_video_unittests
> * metrics_unittests
> * modules_integrationtests
> * modules_unittests
> * neteq_unittests
> * system_wrappers_unittests
> * test_support_unittests
> * tools_unittests
> * video_engine_core_unittests
> * voice_engine_unittests
> 
> Tests that requires bare-metal and audio/video devices:
> * audio_device_integrationtests
> * video_capture_integrationtests
> 
> I also added the isolate boilerplate code for the following
> tests that are not yet pure gtest binaries (which means they
> cannot run isolated yet):
> * video_render_integrationtests
> * vie_auto_test
> * voe_auto_test
> 
> TEST=running isolate.py as described above.
> BUG=1916
> R=tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/1673004

TBR=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2040004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4548 4adac7df-926f-26a2-2b94-8c16560cd09d

16 files changed, 2 insertions, 428 deletions

diff --git a/modules/audio_coding/neteq/neteq.gypi b/modules/audio_coding/neteq/neteq.gypi
index 570ebc21..9a460c4f 100644
--- a/modules/audio_coding/neteq/neteq.gypi
+++ b/modules/audio_coding/neteq/neteq.gypi
@@ -231,24 +231,6 @@
             },
           ],
         }],
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'neteq_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                'neteq_unittests',
-              ],
-              'includes': [
-                '../../../../build/isolate.gypi',
-                'neteq_unittests.isolate',
-              ],
-              'sources': [
-                'neteq_unittests.isolate',
-              ],
-            },
-          ],
-        }],
       ],
     }], # include_tests
   ], # conditions
diff --git a/modules/audio_coding/neteq/neteq_unittests.isolate b/modules/audio_coding/neteq/neteq_unittests.isolate
deleted file mode 100644
index a2c06136..00000000
--- a/modules/audio_coding/neteq/neteq_unittests.isolate
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_touched': [
-          '../../../../DEPS',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../../resources/audio_coding/neteq_network_stats.dat',
-          '../../../../resources/audio_coding/neteq_rtcp_stats.dat',
-          '../../../../resources/audio_coding/neteq_universal.rtp',
-          '../../../../resources/audio_coding/neteq_universal_ref.pcm',
-          '../../../../resources/audio_coding/testfile32kHz.pcm',
-          '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/run_isolated.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/neteq_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
deleted file mode 100644
index 33c4a4b9..00000000
--- a/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_touched': [
-          '../../../../DEPS',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../../resources/audio_coding/testfile32kHz.pcm',
-          '../../../../testing/test_env.py',
-          '../../../../tools/swarm_client/run_isolated.py',
-          '../../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/audio_decoder_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/audio_coding/neteq4/neteq.gypi b/modules/audio_coding/neteq4/neteq.gypi
index a4ff1433..ad6787c0 100644
--- a/modules/audio_coding/neteq4/neteq.gypi
+++ b/modules/audio_coding/neteq4/neteq.gypi
@@ -204,24 +204,6 @@
             },
           ],
         }],
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'audio_decoder_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                'audio_decoder_unittests',
-              ],
-              'includes': [
-                '../../../../build/isolate.gypi',
-                'audio_decoder_unittests.isolate',
-              ],
-              'sources': [
-                'audio_decoder_unittests.isolate',
-              ],
-            },
-          ],
-        }],
       ],
     }], # include_tests
   ], # conditions
diff --git a/modules/audio_device/audio_device.gypi b/modules/audio_device/audio_device.gypi
index df1daec9..a2463f64 100644
--- a/modules/audio_device/audio_device.gypi
+++ b/modules/audio_device/audio_device.gypi
@@ -219,28 +219,8 @@
             'test/func_test_manager.h',
           ],
         },
-      ], # targets
-      'conditions': [
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'audio_device_integrationtests_run',
-              'type': 'none',
-              'dependencies': [
-                'audio_device_integrationtests',
-              ],
-              'includes': [
-                '../../../build/isolate.gypi',
-                'audio_device_integrationtests.isolate',
-              ],
-              'sources': [
-                'audio_device_integrationtests.isolate',
-              ],
-            },
-          ],
-        }],
       ],
-    }], # include_tests
+    }],
   ],
 }
 
diff --git a/modules/audio_device/audio_device_integrationtests.isolate b/modules/audio_device/audio_device_integrationtests.isolate
deleted file mode 100644
index a55f0950..00000000
--- a/modules/audio_device/audio_device_integrationtests.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/audio_device_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/audio_device_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/audio_device/audio_device_test_api.isolate b/modules/audio_device/audio_device_test_api.isolate
deleted file mode 100644
index ec04929f..00000000
--- a/modules/audio_device/audio_device_test_api.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/modules.gyp b/modules/modules.gyp
index 748b6c81..5f661031 100644
--- a/modules/modules.gyp
+++ b/modules/modules.gyp
@@ -335,38 +335,6 @@
             },
           ],
         }],
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'modules_integrationtests_run',
-              'type': 'none',
-              'dependencies': [
-                'modules_integrationtests',
-              ],
-              'includes': [
-                '../../build/isolate.gypi',
-                'modules_integrationtests.isolate',
-              ],
-              'sources': [
-                'modules_integrationtests.isolate',
-              ],
-            },
-            {
-              'target_name': 'modules_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                'modules_unittests',
-              ],
-              'includes': [
-                '../../build/isolate.gypi',
-                'modules_unittests.isolate',
-              ],
-              'sources': [
-                'modules_unittests.isolate',
-              ],
-            },
-          ],
-        }],
       ],
     }], # include_tests
   ], # conditions
diff --git a/modules/modules_integrationtests.isolate b/modules/modules_integrationtests.isolate
deleted file mode 100644
index 92839273..00000000
--- a/modules/modules_integrationtests.isolate
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/modules_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../DEPS',
-          '../../resources/audio_coding/testfile32kHz.pcm',
-          '../../resources/audio_coding/teststereo32kHz.pcm',
-          '../../resources/foreman_cif.yuv',
-          '../../resources/paris_qcif.yuv',
-           '../../testing/test_env.py',
-          '../../tools/swarm_client/run_isolated.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/modules_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate
index 353c24ef..cfe29434 100644
--- a/modules/modules_unittests.isolate
+++ b/modules/modules_unittests.isolate
@@ -15,43 +15,5 @@
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../testing/test_env.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../data/voice_engine/audio_tiny48.wav',
-          '../../DEPS',
-          '../../resources/audio_coding/neteq_network_stats.dat',
-          '../../resources/audio_coding/neteq_rtcp_stats.dat',
-          '../../resources/audio_coding/neteq_universal_new.rtp',
-          '../../resources/audio_coding/neteq_universal_ref.pcm',
-          '../../resources/audio_coding/testfile32kHz.pcm',
-          '../../resources/deflicker_before_cif_short.yuv',
-          '../../resources/far16_stereo.pcm',
-          '../../resources/far32_stereo.pcm',
-          '../../resources/far8_stereo.pcm',
-          '../../resources/foremanColorEnhanced_cif_short.yuv',
-          '../../resources/foreman_cif.yuv',
-          '../../resources/foreman_cif_short.yuv',
-          '../../resources/near16_stereo.pcm',
-          '../../resources/near32_stereo.pcm',
-          '../../resources/near8_stereo.pcm',
-          '../../resources/video_coding/frame-ethernet-ii.pcap',
-          '../../resources/video_coding/frame-loopback.pcap',
-          '../../resources/video_coding/pltype103.rtp',
-          '../../resources/video_coding/ssrcs-2.pcap',
-          '../../resources/video_coding/ssrcs-3.pcap',
-          '../../testing/test_env.py',
-          '../../tools/swarm_client/run_isolated.py',
-          '../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/modules_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
   ],
-}
+}
\ No newline at end of file
diff --git a/modules/video_capture/video_capture.gypi b/modules/video_capture/video_capture.gypi
index b91d029d..05f078b0 100644
--- a/modules/video_capture/video_capture.gypi
+++ b/modules/video_capture/video_capture.gypi
@@ -187,26 +187,6 @@
             }], # OS!="mac"
           ] # conditions
         },
-      ], # targets
-      'conditions': [
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'video_capture_integrationtests_run',
-              'type': 'none',
-              'dependencies': [
-                'video_capture_integrationtests',
-              ],
-              'includes': [
-                '../../../build/isolate.gypi',
-                'video_capture_integrationtests.isolate',
-              ],
-              'sources': [
-                'video_capture_integrationtests.isolate',
-              ],
-            },
-          ],
-        }],
       ],
     }],
   ],
diff --git a/modules/video_capture/video_capture_integrationtests.isolate b/modules/video_capture/video_capture_integrationtests.isolate
deleted file mode 100644
index be85ffb0..00000000
--- a/modules/video_capture/video_capture_integrationtests.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/video_capture_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/video_capture_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/video_capture/video_capture_module_test.isolate b/modules/video_capture/video_capture_module_test.isolate
deleted file mode 100644
index 1c3a4b57..00000000
--- a/modules/video_capture/video_capture_module_test.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/video_render/video_render.gypi b/modules/video_render/video_render.gypi
index 77efd3b6..9f6d4864 100644
--- a/modules/video_render/video_render.gypi
+++ b/modules/video_render/video_render.gypi
@@ -200,26 +200,6 @@
           ] # conditions
         }, # video_render_module_test
       ], # targets
-      'conditions': [
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'video_render_integrationtests_run',
-              'type': 'none',
-              'dependencies': [
-                'video_render_integrationtests',
-              ],
-              'includes': [
-                '../../../build/isolate.gypi',
-                'video_render_integrationtests.isolate',
-              ],
-              'sources': [
-                'video_render_integrationtests.isolate',
-              ],
-            },
-          ],
-        }],
-      ],
     }], # include_tests==0
   ], # conditions
 }
diff --git a/modules/video_render/video_render_integrationtests.isolate b/modules/video_render/video_render_integrationtests.isolate
deleted file mode 100644
index 83f609f9..00000000
--- a/modules/video_render/video_render_integrationtests.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/video_render_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/video_render_integrationtests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/modules/video_render/video_render_module_test.isolate b/modules/video_render/video_render_module_test.isolate
deleted file mode 100644
index 6157b6d6..00000000
--- a/modules/video_render/video_render_module_test.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}