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

Unified Diff: googletest/tests/trace_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/tests/run_test_cases_test.py ('k') | googletest/trace_test_cases.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: googletest/tests/trace_test_cases_smoke_test.py
diff --git a/tests/trace_test_cases_smoke_test.py b/googletest/tests/trace_test_cases_smoke_test.py
similarity index 95%
rename from tests/trace_test_cases_smoke_test.py
rename to googletest/tests/trace_test_cases_smoke_test.py
index 8ceb88b4e455c5c6ff5c7a5bc4c8ad31c5bc4389..a7cf6edf863c4d12849ddc303d9c824a99e9911a 100755
--- a/tests/trace_test_cases_smoke_test.py
+++ b/googletest/tests/trace_test_cases_smoke_test.py
@@ -13,7 +13,8 @@ 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)
sys.path.insert(0, os.path.join(BASE_DIR, 'gtest_fake'))
@@ -29,7 +30,7 @@ class TraceTestCases(unittest.TestCase):
def setUp(self):
self.temp_file = None
- self.initial_cwd = ROOT_DIR
+ self.initial_cwd = GOOGLETEST_DIR
if sys.platform == 'win32':
# Windows has no kernel mode concept of current working directory.
self.initial_cwd = None
@@ -70,7 +71,7 @@ class TraceTestCases(unittest.TestCase):
cmd = [
sys.executable,
- os.path.join(ROOT_DIR, 'trace_test_cases.py'),
+ os.path.join(GOOGLETEST_DIR, 'trace_test_cases.py'),
# Forces 4 parallel jobs.
'--jobs', '4',
'--out', self.temp_file,
@@ -83,7 +84,7 @@ class TraceTestCases(unittest.TestCase):
cmd,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
universal_newlines=True,
- cwd=ROOT_DIR)
+ cwd=GOOGLETEST_DIR)
out, err = proc.communicate() or ('', '') # pylint is confused.
self.assertEqual(0, proc.returncode, (out, err))
lines = out.splitlines()
@@ -148,7 +149,7 @@ class TraceTestCases(unittest.TestCase):
],
u'executable': trace_inputs.get_native_path_case(
unicode(self.executable)),
- u'initial_cwd': ROOT_DIR,
+ u'initial_cwd': GOOGLETEST_DIR,
},
}
if sys.platform == 'win32':
« no previous file with comments | « googletest/tests/run_test_cases_test.py ('k') | googletest/trace_test_cases.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698