Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: googletest/tests/fix_test_cases_smoke_test.py

Issue 19917006: Move all googletest related scripts into googletest/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/swarm_client
Patch Set: Remove unnecessary pylint warning disable Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « googletest/shard_test_cases.py ('k') | googletest/tests/gtest_fake/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: googletest/tests/fix_test_cases_smoke_test.py
diff --git a/tests/fix_test_cases_smoke_test.py b/googletest/tests/fix_test_cases_smoke_test.py
similarity index 91%
rename from tests/fix_test_cases_smoke_test.py
rename to googletest/tests/fix_test_cases_smoke_test.py
index 3f501491c1dbd89a31a5e6e2932e5cd2d37b67ef..a3ee62d3b79b036b3e2021d752c3a334afa53b25 100755
--- a/tests/fix_test_cases_smoke_test.py
+++ b/googletest/tests/fix_test_cases_smoke_test.py
@@ -14,7 +14,9 @@ import tempfile
import unittest
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-ROOT_DIR = os.path.dirname(BASE_DIR)
+GOOGLETEST_DIR = os.path.dirname(BASE_DIR)
+ROOT_DIR = os.path.dirname(GOOGLETEST_DIR)
+
sys.path.insert(0, ROOT_DIR)
import run_isolated
@@ -40,7 +42,7 @@ class FixTestCases(unittest.TestCase):
cmd = cmd + ['--verbose'] * 3
logging.info(cmd)
proc = subprocess.Popen(
- [sys.executable, os.path.join(ROOT_DIR, cmd[0])] + cmd[1:],
+ [sys.executable] + cmd,
cwd=self.srcdir,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
@@ -78,7 +80,7 @@ class FixTestCases(unittest.TestCase):
_copy('gtest_fake_base.py')
_copy('gtest_fake_pass.py')
shutil.copy(
- os.path.join(ROOT_DIR, 'run_test_cases.py'),
+ os.path.join(GOOGLETEST_DIR, 'run_test_cases.py'),
os.path.join(self.srcdir, 'run_test_cases.py'))
shutil.copy(
os.path.join(ROOT_DIR, 'run_isolated.py'),
@@ -86,14 +88,19 @@ class FixTestCases(unittest.TestCase):
logging.debug('1. Create a .isolated file out of the .isolate file.')
isolated = os.path.join(self.srcdir, 'gtest_fake_pass.isolated')
- out = self._run(['isolate.py', 'check', '-i', isolate, '-s', isolated,
- '-V', 'chromeos', str(chromeos_value)])
+ out = self._run(
+ [
+ os.path.join(ROOT_DIR, 'isolate.py'),
+ 'check', '-i', isolate, '-s', isolated,
+ '-V', 'chromeos', str(chromeos_value),
+ ])
if not VERBOSE:
self.assertEqual('', out)
logging.debug('2. Run fix_test_cases.py on it.')
# Give up on looking at stdout.
- _ = self._run(['fix_test_cases.py', '-s', isolated])
+ _ = self._run(
+ [os.path.join(GOOGLETEST_DIR, 'fix_test_cases.py'), '-s', isolated])
logging.debug('3. Asserting the content of the .isolated file.')
with open(isolated) as f:
« no previous file with comments | « googletest/shard_test_cases.py ('k') | googletest/tests/gtest_fake/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698