mirror of
https://github.com/boostorg/build.git
synced 2026-02-16 13:22:11 +00:00
Minor stylistic cleanup in the main Boost Build test runner script.
[SVN r78878]
This commit is contained in:
Jurko Gospodnetić
@@ -6,11 +6,13 @@
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
import os
|
||||
import sys
|
||||
import string
|
||||
import BoostBuild
|
||||
|
||||
import os
|
||||
import os.path
|
||||
import string
|
||||
import sys
|
||||
|
||||
xml = "--xml" in sys.argv
|
||||
toolset = BoostBuild.get_toolset()
|
||||
|
||||
@@ -28,11 +30,13 @@ BoostBuild.set_defer_annotations(1)
|
||||
|
||||
|
||||
def run_tests(critical_tests, other_tests):
|
||||
"""Runs first critical tests and then other_tests.
|
||||
"""
|
||||
Runs first the critical_tests and then the other_tests.
|
||||
|
||||
Writes the name of the first failed test to test_results.txt. Critical
|
||||
tests are run in the specified order, other tests are run starting with the
|
||||
one that failed first on the last test time.
|
||||
|
||||
Stops on first error, and write the name of failed test to
|
||||
test_results.txt. Critical tests are run in the specified order, other
|
||||
tests are run starting with the one that failed the last time.
|
||||
"""
|
||||
last_failed = last_failed_test()
|
||||
other_tests = reorder_tests(other_tests, last_failed)
|
||||
@@ -43,29 +47,40 @@ def run_tests(critical_tests, other_tests):
|
||||
pass_count = 0
|
||||
failures_count = 0
|
||||
|
||||
for i in all_tests:
|
||||
passed = 1
|
||||
for test in all_tests:
|
||||
if not xml:
|
||||
print ("%-25s : " %(i)),
|
||||
print("%-25s :" % test),
|
||||
|
||||
passed = 0
|
||||
try:
|
||||
__import__(i)
|
||||
__import__(test)
|
||||
passed = 1
|
||||
except SystemExit:
|
||||
passed = 0;
|
||||
if failures_count == 0:
|
||||
"""This is the regular way our test scripts are supposed to report
|
||||
test failures."""
|
||||
|
||||
if passed:
|
||||
pass_count += 1
|
||||
else:
|
||||
failures_count += 1
|
||||
if failures_count == 1:
|
||||
f = open(os.path.join(invocation_dir, 'test_results.txt'), 'w')
|
||||
f.write(i)
|
||||
f.close()
|
||||
failures_count = failures_count + 1
|
||||
# Restore the current directory, which might be changed by the test.
|
||||
os.chdir(invocation_dir)
|
||||
try:
|
||||
f.write(test)
|
||||
finally:
|
||||
f.close()
|
||||
|
||||
# Restore the current directory, which might have been changed by the
|
||||
# test.
|
||||
os.chdir(invocation_dir)
|
||||
|
||||
if not xml:
|
||||
if passed:
|
||||
print "PASSED"
|
||||
print("PASSED")
|
||||
else:
|
||||
print "FAILED"
|
||||
print("FAILED")
|
||||
|
||||
if i == "regression":
|
||||
if test == "regression":
|
||||
BoostBuild.flush_annotations()
|
||||
BoostBuild.clear_annotations()
|
||||
else:
|
||||
@@ -74,23 +89,19 @@ def run_tests(critical_tests, other_tests):
|
||||
rs = "fail"
|
||||
print """
|
||||
<test-log library="build" test-name="%s" test-type="run" toolset="%s" test-program="%s" target-directory="%s">
|
||||
<run result="%s">""" % (i, toolset, "tools/build/v2/test/" + i + ".py",
|
||||
"boost/bin.v2/boost.build.tests/" + toolset + "/" + i, rs)
|
||||
|
||||
<run result="%s">""" % (test, toolset, "tools/build/v2/test/" + test + ".py",
|
||||
"boost/bin.v2/boost.build.tests/" + toolset + "/" + test, rs)
|
||||
if not passed:
|
||||
BoostBuild.flush_annotations(1)
|
||||
|
||||
print """
|
||||
</run>
|
||||
</test-log>
|
||||
"""
|
||||
if passed:
|
||||
pass_count = pass_count + 1
|
||||
sys.stdout.flush() # Makes testing under emacs more entertaining.
|
||||
|
||||
# Erase the file on success.
|
||||
if failures_count == 0:
|
||||
open('test_results.txt', 'w')
|
||||
open('test_results.txt', 'w').close()
|
||||
|
||||
if not xml:
|
||||
print """
|
||||
@@ -101,12 +112,15 @@ def run_tests(critical_tests, other_tests):
|
||||
|
||||
|
||||
def last_failed_test():
|
||||
"Returns the name of last failed test or None"
|
||||
"Returns the name of last failed test or None."
|
||||
try:
|
||||
f = open("test_results.txt")
|
||||
s = string.strip(f.read())
|
||||
try:
|
||||
s = string.strip(f.read())
|
||||
finally:
|
||||
f.close()
|
||||
return s
|
||||
except:
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
@@ -118,115 +132,114 @@ def reorder_tests(tests, first_test):
|
||||
return tests
|
||||
|
||||
|
||||
critical_tests = ["unit_tests", "module_actions", "startup_v2"]
|
||||
critical_tests = ["unit_tests", "module_actions", "startup_v2", "core_d12",
|
||||
"core_typecheck", "core_delete_module", "core_language", "core_arguments",
|
||||
"core_varnames", "core_import_module"]
|
||||
|
||||
critical_tests += ["core_d12", "core_typecheck", "core_delete_module",
|
||||
"core_language", "core_arguments", "core_varnames", "core_import_module"]
|
||||
|
||||
tests = [ "absolute_sources",
|
||||
"alias",
|
||||
"alternatives",
|
||||
"bad_dirname",
|
||||
"build_dir",
|
||||
"build_file",
|
||||
"build_no",
|
||||
"builtin_echo",
|
||||
"builtin_exit",
|
||||
"builtin_split_by_characters",
|
||||
"c_file",
|
||||
"chain",
|
||||
"clean",
|
||||
"composite",
|
||||
"conditionals",
|
||||
"conditionals2",
|
||||
"conditionals3",
|
||||
"conditionals_multiple",
|
||||
"configuration",
|
||||
"copy_time",
|
||||
"core_action_status",
|
||||
"core_actions_quietly",
|
||||
"core_at_file",
|
||||
"core_bindrule",
|
||||
"core_nt_line_length",
|
||||
"core_option_d2",
|
||||
"core_option_l",
|
||||
"core_option_n",
|
||||
"core_parallel_actions",
|
||||
"core_parallel_multifile_actions_1",
|
||||
"core_parallel_multifile_actions_2",
|
||||
"core_update_now",
|
||||
"core_variables_in_actions",
|
||||
"custom_generator",
|
||||
"default_build",
|
||||
"default_features",
|
||||
tests = ["absolute_sources",
|
||||
"alias",
|
||||
"alternatives",
|
||||
"bad_dirname",
|
||||
"build_dir",
|
||||
"build_file",
|
||||
"build_no",
|
||||
"builtin_echo",
|
||||
"builtin_exit",
|
||||
"builtin_split_by_characters",
|
||||
"c_file",
|
||||
"chain",
|
||||
"clean",
|
||||
"composite",
|
||||
"conditionals",
|
||||
"conditionals2",
|
||||
"conditionals3",
|
||||
"conditionals_multiple",
|
||||
"configuration",
|
||||
"copy_time",
|
||||
"core_action_status",
|
||||
"core_actions_quietly",
|
||||
"core_at_file",
|
||||
"core_bindrule",
|
||||
"core_nt_line_length",
|
||||
"core_option_d2",
|
||||
"core_option_l",
|
||||
"core_option_n",
|
||||
"core_parallel_actions",
|
||||
"core_parallel_multifile_actions_1",
|
||||
"core_parallel_multifile_actions_2",
|
||||
"core_update_now",
|
||||
"core_variables_in_actions",
|
||||
"custom_generator",
|
||||
"default_build",
|
||||
"default_features",
|
||||
# This test is known to be broken itself.
|
||||
# "default_toolset",
|
||||
"dependency_property",
|
||||
"dependency_test",
|
||||
"direct_request_test",
|
||||
"disambiguation",
|
||||
"dll_path",
|
||||
"double_loading",
|
||||
"duplicate",
|
||||
"example_libraries",
|
||||
"example_make",
|
||||
"expansion",
|
||||
"explicit",
|
||||
"free_features_request",
|
||||
"generator_selection",
|
||||
"generators_test",
|
||||
"implicit_dependency",
|
||||
"indirect_conditional",
|
||||
"inherit_toolset",
|
||||
"inherited_dependency",
|
||||
"inline",
|
||||
"lib_source_property",
|
||||
"library_chain",
|
||||
"library_property",
|
||||
"load_order",
|
||||
"loop",
|
||||
"make_rule",
|
||||
"ndebug",
|
||||
"no_type",
|
||||
"notfile",
|
||||
"ordered_include",
|
||||
"out_of_tree",
|
||||
"path_features",
|
||||
"prebuilt",
|
||||
"print",
|
||||
"project_dependencies",
|
||||
"project_glob",
|
||||
"project_root_constants",
|
||||
"project_root_rule",
|
||||
"project_test3",
|
||||
"project_test4",
|
||||
"property_expansion",
|
||||
"rebuilds",
|
||||
"regression",
|
||||
"relative_sources",
|
||||
"remove_requirement",
|
||||
"rescan_header",
|
||||
"resolution",
|
||||
"searched_lib",
|
||||
"skipping",
|
||||
"sort_rule",
|
||||
"source_locations",
|
||||
"space_in_path",
|
||||
"stage",
|
||||
"standalone",
|
||||
"suffix",
|
||||
"tag",
|
||||
"test_result_dumping",
|
||||
"testing_support",
|
||||
"timedata",
|
||||
"unit_test",
|
||||
"unused",
|
||||
"use_requirements",
|
||||
"using",
|
||||
"wrapper",
|
||||
"wrong_project",
|
||||
"exit_status",
|
||||
]
|
||||
# "default_toolset",
|
||||
"dependency_property",
|
||||
"dependency_test",
|
||||
"direct_request_test",
|
||||
"disambiguation",
|
||||
"dll_path",
|
||||
"double_loading",
|
||||
"duplicate",
|
||||
"example_libraries",
|
||||
"example_make",
|
||||
"expansion",
|
||||
"explicit",
|
||||
"free_features_request",
|
||||
"generator_selection",
|
||||
"generators_test",
|
||||
"implicit_dependency",
|
||||
"indirect_conditional",
|
||||
"inherit_toolset",
|
||||
"inherited_dependency",
|
||||
"inline",
|
||||
"lib_source_property",
|
||||
"library_chain",
|
||||
"library_property",
|
||||
"load_order",
|
||||
"loop",
|
||||
"make_rule",
|
||||
"ndebug",
|
||||
"no_type",
|
||||
"notfile",
|
||||
"ordered_include",
|
||||
"out_of_tree",
|
||||
"path_features",
|
||||
"prebuilt",
|
||||
"print",
|
||||
"project_dependencies",
|
||||
"project_glob",
|
||||
"project_root_constants",
|
||||
"project_root_rule",
|
||||
"project_test3",
|
||||
"project_test4",
|
||||
"property_expansion",
|
||||
"rebuilds",
|
||||
"regression",
|
||||
"relative_sources",
|
||||
"remove_requirement",
|
||||
"rescan_header",
|
||||
"resolution",
|
||||
"searched_lib",
|
||||
"skipping",
|
||||
"sort_rule",
|
||||
"source_locations",
|
||||
"space_in_path",
|
||||
"stage",
|
||||
"standalone",
|
||||
"suffix",
|
||||
"tag",
|
||||
"test_result_dumping",
|
||||
"testing_support",
|
||||
"timedata",
|
||||
"unit_test",
|
||||
"unused",
|
||||
"use_requirements",
|
||||
"using",
|
||||
"wrapper",
|
||||
"wrong_project",
|
||||
"exit_status",
|
||||
]
|
||||
|
||||
if os.name == 'posix':
|
||||
tests.append("symlink")
|
||||
@@ -240,8 +253,8 @@ if os.name == 'posix':
|
||||
if string.find(BoostBuild.get_toolset(), 'gcc') == 0:
|
||||
tests.append("gcc_runtime")
|
||||
|
||||
if ( string.find(BoostBuild.get_toolset(), 'gcc') == 0 )or \
|
||||
( string.find(BoostBuild.get_toolset(), 'msvc') == 0 ):
|
||||
if (string.find(BoostBuild.get_toolset(), 'gcc') == 0) or \
|
||||
(string.find(BoostBuild.get_toolset(), 'msvc') == 0):
|
||||
tests.append("pch")
|
||||
|
||||
if "--extras" in sys.argv:
|
||||
@@ -252,8 +265,7 @@ if "--extras" in sys.argv:
|
||||
tests.append("example_customization")
|
||||
# Requires gettext tools.
|
||||
tests.append("example_gettext")
|
||||
|
||||
elif not xml:
|
||||
print 'Note: skipping extra tests'
|
||||
print('Note: skipping extra tests')
|
||||
|
||||
run_tests(critical_tests, tests)
|
||||
|
||||
Reference in New Issue
Block a user