Index: mojo/tools/get_test_list.py |
diff --git a/mojo/tools/get_test_list.py b/mojo/tools/get_test_list.py |
index c59602c10244b174054ca4e0120d7a7db2ceaa19..6d6b8fb1a17be040ab2d53146b96449d10e4b2d3 100755 |
--- a/mojo/tools/get_test_list.py |
+++ b/mojo/tools/get_test_list.py |
@@ -117,9 +117,24 @@ def GetTestList(config, verbose_count=0): |
if (target_os == Config.OS_LINUX and |
config.sanitizer != Config.SANITIZER_ASAN and |
ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "go")): |
- AddEntry("Go unit tests", |
+ # Go system tests: |
+ AddEntry("Go system tests", |
[os.path.join(build_dir, "obj", "mojo", "go", "system_test")]) |
+ # Pure Go unit tests: |
+ if "go_build_tool" in config.values: |
+ go_tool = config.values["go_build_tool"] |
+ else: |
+ # Note(rudominer) This branch is necessary for when this script is |
+ # run on the bots. In that case the config.values dictionary is built in |
+ # the bot's recipe script and does not contain a value for |
+ # "go_build_tool." Consider adding that value there instead. |
+ go_tool = os.path.join(Paths().src_root, "third_party", "go", "tool", |
+ "linux_amd64", "bin", "go") |
ppi
2015/10/06 20:33:27
I think we want two more spaces here. Or align wit
rudominer
2015/10/06 20:52:40
Done.
|
+ AddEntry("Go unit tests", |
+ ["python", os.path.join("mojo", "tools", "run_pure_go_tests.py"), |
+ go_tool, os.path.join("mojo", "tools", "data", "gotests")]) |
+ |
# Python unit tests: |
if ShouldRunTest(Config.TEST_TYPE_DEFAULT, Config.TEST_TYPE_UNIT, "python"): |
AddEntry("Python unit tests", |