boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 00:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix new tests for Windows, matching 40e7f0e8dd

Browse Source
This commit is contained in:
Steven Watanabe
2017-12-15 16:00:32 -07:00
parent e31489760c
commit ff8709997e
2 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/configure.py
View File

@@ -35,9 +35,9 @@ obj bar : foo.cpp :
t.expect_output_lines([
" - pass builds : yes",
" - fail builds : no"])
t.expect_addition("bin/$toolset/debug/pass.obj")
t.expect_addition("bin/$toolset/debug/foo.obj")
t.expect_addition("bin/$toolset/debug/bar.obj")
t.expect_addition("bin/$toolset/debug*/pass.obj")
t.expect_addition("bin/$toolset/debug*/foo.obj")
t.expect_addition("bin/$toolset/debug*/bar.obj")
t.expect_nothing_more()
# An up-to-date build should use the cache
@@ -52,9 +52,9 @@ obj bar : foo.cpp :
t.expect_output_lines([
" - pass builds : yes",
" - fail builds : no"])
t.expect_touch("bin/$toolset/debug/pass.obj")
t.expect_touch("bin/$toolset/debug/foo.obj")
t.expect_touch("bin/$toolset/debug/bar.obj")
t.expect_touch("bin/$toolset/debug*/pass.obj")
t.expect_touch("bin/$toolset/debug*/foo.obj")
t.expect_touch("bin/$toolset/debug*/bar.obj")
t.expect_nothing_more()
# --reconfigure should re-run configuration checks only
@@ -62,7 +62,7 @@ obj bar : foo.cpp :
t.expect_output_lines([
" - pass builds : yes",
" - fail builds : no"])
t.expect_touch("bin/$toolset/debug/pass.obj")
t.expect_touch("bin/$toolset/debug*/pass.obj")
t.expect_nothing_more()
t.cleanup()

76
test/testing_support.py
View File

@@ -25,17 +25,17 @@ run fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/pass.test/$toolset/debug/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug/pass.output")
t.expect_addition("bin/pass.test/$toolset/debug/pass.run")
t.expect_addition("bin/pass.test/$toolset/debug/pass.test")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.output")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.run")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.test")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.output")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.output")
t.expect_nothing_more()
@@ -57,17 +57,17 @@ run-fail fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/pass.test/$toolset/debug/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug/pass.output")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.output")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.output")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.run")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.test")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.output")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.run")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.test")
t.expect_nothing_more()
@@ -89,15 +89,15 @@ link fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/pass.test/$toolset/debug/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug/pass.test")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.exe")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.test")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.test")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.exe")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.test")
t.expect_nothing_more()
@@ -119,13 +119,13 @@ link-fail fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/pass.test/$toolset/debug/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.exe")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.test")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.exe")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.test")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.obj")
t.expect_nothing_more()
@@ -147,14 +147,14 @@ compile fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/pass.test/$toolset/debug/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug/pass.test")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.obj")
t.expect_addition("bin/pass.test/$toolset/debug*/pass.test")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug/fail-link.test")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.obj")
t.expect_addition("bin/fail-link.test/$toolset/debug*/fail-link.test")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug/fail-run.test")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.obj")
t.expect_addition("bin/fail-run.test/$toolset/debug*/fail-run.test")
t.expect_nothing_more()
@@ -176,8 +176,8 @@ compile-fail fail-run.cpp ;
""")
t.run_build_system(status=1)
t.expect_addition("bin/fail-compile.test/$toolset/debug/fail-compile.obj")
t.expect_addition("bin/fail-compile.test/$toolset/debug/fail-compile.test")
t.expect_addition("bin/fail-compile.test/$toolset/debug*/fail-compile.obj")
t.expect_addition("bin/fail-compile.test/$toolset/debug*/fail-compile.test")
t.expect_nothing_more()