From ff8709997ea6868587e08067716cfcda32e2ac65 Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Fri, 15 Dec 2017 16:00:32 -0700 Subject: [PATCH] Fix new tests for Windows, matching 40e7f0e8dd080c3bec9df6b5ff49149ed4349260 --- test/configure.py | 14 ++++---- test/testing_support.py | 76 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/test/configure.py b/test/configure.py index 62c884683..00b007ac2 100644 --- a/test/configure.py +++ b/test/configure.py @@ -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() diff --git a/test/testing_support.py b/test/testing_support.py index ade730899..f6dd5412c 100755 --- a/test/testing_support.py +++ b/test/testing_support.py @@ -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()