diff --git a/lnt/tests/compile.py b/lnt/tests/compile.py index 0ecc243d..9c5fe40f 100644 --- a/lnt/tests/compile.py +++ b/lnt/tests/compile.py @@ -766,11 +766,7 @@ def run_test(self, opts): print("%s: creating sandbox: %r" % ( timestamp(), opts.sandbox_path), file=sys.stderr) os.mkdir(opts.sandbox_path) - if opts.timestamp_build: - fmt_timestamp = timestamp().replace(' ', '_').replace(':', '-') - report_name = "test-%s" % (fmt_timestamp) - else: - report_name = "build" + report_name = f"test-{timestamp().replace(' ', '_').replace(':', '-')}" g_output_dir = os.path.join(os.path.abspath(opts.sandbox_path), report_name) @@ -997,8 +993,6 @@ def file_log_handler(path): help="Parent directory to build and run tests in", type=click.UNPROCESSED, default=None, metavar="PATH") # Test Options -@click.option("--timestamp/--no-timestamp", "timestamp_build", default=True, show_default=True, - help="Whether to timestamp the build directory (for testing)") @click.option("--cc", "cc", type=click.UNPROCESSED, required=True, help="Path to the compiler under test") @click.option("--cxx", "cxx", diff --git a/lnt/tests/test_suite.py b/lnt/tests/test_suite.py index 2a842369..e5dddc4a 100644 --- a/lnt/tests/test_suite.py +++ b/lnt/tests/test_suite.py @@ -350,12 +350,7 @@ def run_test(self, opts): # We'll return early from _run_interleaved_builds(), so basedir doesn't matter basedir = opts.sandbox_path else: - # Normal mode: use sandbox/build or sandbox/test- - if opts.timestamp_build: - ts = self.start_time.replace(' ', '_').replace(':', '-') - build_dir_name = "test-%s" % ts - else: - build_dir_name = "build" + build_dir_name = f"test-{self.start_time.replace(' ', '_').replace(':', '-')}" basedir = os.path.join(opts.sandbox_path, build_dir_name) self._base_path = basedir @@ -1314,8 +1309,6 @@ def diagnose(self): @click.option("-S", "--sandbox", "sandbox_path", required=True, help="Parent directory to build and run tests in", type=click.UNPROCESSED, metavar="PATH") -@click.option("--timestamp/--no-timestamp", "timestamp_build", default=True, show_default=True, - help="Whether to timestamp the build directory (for testing)") @click.option("--configure/--no-configure", "run_configure", default=True, show_default=True, help="Whether to run CMake if CMakeCache.txt is present (--no-configure is only " "useful with --no-timestamp)") diff --git a/tests/runtest/multisample.py b/tests/runtest/multisample.py index 8d34c61a..e0324cd5 100644 --- a/tests/runtest/multisample.py +++ b/tests/runtest/multisample.py @@ -4,7 +4,7 @@ # RUN: --sandbox %t.SANDBOX \ # RUN: --test-suite %S/Inputs/test-suite \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ -# RUN: --no-timestamp --multisample 5 > %t.log 2> %t.err +# RUN: --multisample 5 > %t.log 2> %t.err # # RUN: filecheck --check-prefix CHECK-STDOUT < %t.log %s # RUN: filecheck --check-prefix CHECK-STDERR < %t.err %s diff --git a/tests/runtest/nt-darwin.py b/tests/runtest/nt-darwin.py index 42a48710..86e8a461 100644 --- a/tests/runtest/nt-darwin.py +++ b/tests/runtest/nt-darwin.py @@ -5,7 +5,7 @@ # RUN: --sandbox %t.SANDBOX \ # RUN: --test-suite %S/Inputs/test-suite \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ -# RUN: --no-timestamp --use-isolation > %t.log 2> %t.err +# RUN: --use-isolation > %t.log 2> %t.err # RUN: filecheck --check-prefix CHECK-SANDBOX < %t.err %s # # CHECK-SANDBOX: creating sandbox profile diff --git a/tests/runtest/only_test.py b/tests/runtest/only_test.py index ac41b042..f1892651 100644 --- a/tests/runtest/only_test.py +++ b/tests/runtest/only_test.py @@ -5,7 +5,7 @@ # RUN: --test-suite %S/Inputs/test-suite \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --only-test subtest \ -# RUN: --no-timestamp > %t.log 2> %t.err +# RUN: > %t.log 2> %t.err # # RUN: filecheck --check-prefix CHECK-STDOUT < %t.log %s # RUN: filecheck --check-prefix CHECK-STDERR < %t.err %s diff --git a/tests/runtest/rerun.py b/tests/runtest/rerun.py index 8e3f86cd..0cb5e9fc 100644 --- a/tests/runtest/rerun.py +++ b/tests/runtest/rerun.py @@ -13,7 +13,7 @@ # RUN: --sandbox %t.SANDBOX \ # RUN: --test-suite %S/Inputs/rerun-test-suite1 \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ -# RUN: --no-timestamp --rerun --run-order 1 > %t.log 2> %t.err +# RUN: --rerun --run-order 1 > %t.log 2> %t.err # RUN: filecheck --check-prefix CHECK-STDOUT < %t.log %s # RUN: filecheck --check-prefix CHECK-STDERR < %t.err %s @@ -39,7 +39,7 @@ # RUN: --sandbox %t.SANDBOX2 \ # RUN: --test-suite %S/Inputs/rerun-test-suite2 \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ -# RUN: --no-timestamp --rerun --run-order 4 --verbose \ +# RUN: --rerun --run-order 4 --verbose \ # RUN: > %t.2.log 2> %t.2.err || cat %t.2.err # RUN: echo "Run 2" # RUN: filecheck --check-prefix CHECK-STDOUT2 < %t.2.log %s diff --git a/tests/runtest/test_suite-benchmarking-only.shtest b/tests/runtest/test_suite-benchmarking-only.shtest index 9dbe3e5e..c402e144 100644 --- a/tests/runtest/test_suite-benchmarking-only.shtest +++ b/tests/runtest/test_suite-benchmarking-only.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-build-dir.shtest b/tests/runtest/test_suite-build-dir.shtest index 40075ac9..feb7bb4c 100644 --- a/tests/runtest/test_suite-build-dir.shtest +++ b/tests/runtest/test_suite-build-dir.shtest @@ -5,7 +5,6 @@ # RUN: mkdir -p %t.CUSTOM_BUILD # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -25,7 +24,6 @@ # Test 2: --exec with --build-dir using the custom build location # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --exec \ # RUN: --build-dir %t.CUSTOM_BUILD/mybuild \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -43,7 +41,6 @@ # Test 3: Error case - --exec with --build-dir pointing to non-existent directory should fail # RUN: not lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --exec \ # RUN: --build-dir %t.NONEXISTENT \ # RUN: --use-lit %S/Inputs/test-suite-cmake/fake-lit \ @@ -56,7 +53,6 @@ # RUN: mkdir -p %t.UNCONFIGURED # RUN: not lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --exec \ # RUN: --build-dir %t.UNCONFIGURED \ # RUN: --use-lit %S/Inputs/test-suite-cmake/fake-lit \ @@ -67,7 +63,6 @@ # Test 5: --exec with --build-dir and --only-test (tuple conversion test) # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --exec \ # RUN: --build-dir %t.CUSTOM_BUILD/mybuild \ # RUN: --only-test SingleSource \ diff --git a/tests/runtest/test_suite-c-compiler.shtest b/tests/runtest/test_suite-c-compiler.shtest index c034f3ca..e3d8fcdb 100644 --- a/tests/runtest/test_suite-c-compiler.shtest +++ b/tests/runtest/test_suite-c-compiler.shtest @@ -3,13 +3,12 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cmake-define=CMAKE_C_COMPILER:STRING=%{shared_inputs}/FakeCompilers/clang-r154332 \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ # RUN: --use-make %S/Inputs/test-suite-cmake/fake-make \ -# RUN: --use-lit %S/Inputs/test-suite-cmake/fake-lit \ -# RUN: > %t.log 2> %t.err || true +# RUN: --use-lit %S/Inputs/test-suite-cmake/fake-lit # RUN: filecheck --check-prefix CHECK-CC-CONFL-CMAKEDEF < %t.SANDBOX/build/report.json %s # CHECK-CC-CONFL-CMAKEDEF: "run_order": "154332" diff --git a/tests/runtest/test_suite-cache.shtest b/tests/runtest/test_suite-cache.shtest index 1a5da4f9..2ea9cb84 100644 --- a/tests/runtest/test_suite-cache.shtest +++ b/tests/runtest/test_suite-cache.shtest @@ -4,7 +4,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -36,7 +35,6 @@ # Check a run of test-suite using a invalid cmake cache # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cc.shtest b/tests/runtest/test_suite-cc.shtest index 2df68eaa..a772506c 100644 --- a/tests/runtest/test_suite-cc.shtest +++ b/tests/runtest/test_suite-cc.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ # RUN: --use-make %S/Inputs/test-suite-cmake/fake-make \ diff --git a/tests/runtest/test_suite-cflags0.shtest b/tests/runtest/test_suite-cflags0.shtest index bc7a18e9..d4cbc3e2 100644 --- a/tests/runtest/test_suite-cflags0.shtest +++ b/tests/runtest/test_suite-cflags0.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cflags1.shtest b/tests/runtest/test_suite-cflags1.shtest index 851ccf1e..466dcdaa 100644 --- a/tests/runtest/test_suite-cflags1.shtest +++ b/tests/runtest/test_suite-cflags1.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cflags2.shtest b/tests/runtest/test_suite-cflags2.shtest index 0140db11..dd272f90 100644 --- a/tests/runtest/test_suite-cflags2.shtest +++ b/tests/runtest/test_suite-cflags2.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cflags3.shtest b/tests/runtest/test_suite-cflags3.shtest index b9b3ede0..fb95fa82 100644 --- a/tests/runtest/test_suite-cflags3.shtest +++ b/tests/runtest/test_suite-cflags3.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cflags4.shtest b/tests/runtest/test_suite-cflags4.shtest index b7d26664..c3bb20c0 100644 --- a/tests/runtest/test_suite-cflags4.shtest +++ b/tests/runtest/test_suite-cflags4.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-compile-only.shtest b/tests/runtest/test_suite-compile-only.shtest index 6d5b48e8..d9f715d5 100644 --- a/tests/runtest/test_suite-compile-only.shtest +++ b/tests/runtest/test_suite-compile-only.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-cross.shtest b/tests/runtest/test_suite-cross.shtest index c916a47e..1930eb55 100644 --- a/tests/runtest/test_suite-cross.shtest +++ b/tests/runtest/test_suite-cross.shtest @@ -3,7 +3,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cmake-define=CMAKE_C_COMPILER_TARGET:STRING=targetarch-linux-gnu \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite-fail-compile.shtest b/tests/runtest/test_suite-fail-compile.shtest index 1998e8f2..20e4a3f8 100644 --- a/tests/runtest/test_suite-fail-compile.shtest +++ b/tests/runtest/test_suite-fail-compile.shtest @@ -1,7 +1,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite-fail-exec.shtest b/tests/runtest/test_suite-fail-exec.shtest index 912161fe..a8df792b 100644 --- a/tests/runtest/test_suite-fail-exec.shtest +++ b/tests/runtest/test_suite-fail-exec.shtest @@ -1,7 +1,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite-machine-name.shtest b/tests/runtest/test_suite-machine-name.shtest index 08cc9a6e..6e65580a 100644 --- a/tests/runtest/test_suite-machine-name.shtest +++ b/tests/runtest/test_suite-machine-name.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite-metrics.shtest b/tests/runtest/test_suite-metrics.shtest index aee72268..6818d88c 100644 --- a/tests/runtest/test_suite-metrics.shtest +++ b/tests/runtest/test_suite-metrics.shtest @@ -3,7 +3,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-only-test.shtest b/tests/runtest/test_suite-only-test.shtest index 8583163b..5f783594 100644 --- a/tests/runtest/test_suite-only-test.shtest +++ b/tests/runtest/test_suite-only-test.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-perf-events.shtest b/tests/runtest/test_suite-perf-events.shtest index 07ccaa32..64e623e7 100644 --- a/tests/runtest/test_suite-perf-events.shtest +++ b/tests/runtest/test_suite-perf-events.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-pgo.shtest b/tests/runtest/test_suite-pgo.shtest index 611293d3..0237fe2b 100644 --- a/tests/runtest/test_suite-pgo.shtest +++ b/tests/runtest/test_suite-pgo.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -20,7 +19,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-profile-import.py b/tests/runtest/test_suite-profile-import.py index 3bcd6007..2f4b4a60 100644 --- a/tests/runtest/test_suite-profile-import.py +++ b/tests/runtest/test_suite-profile-import.py @@ -2,7 +2,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-profile.shtest b/tests/runtest/test_suite-profile.shtest index 24d3f6e8..74c27ffe 100644 --- a/tests/runtest/test_suite-profile.shtest +++ b/tests/runtest/test_suite-profile.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-run-order.shtest b/tests/runtest/test_suite-run-order.shtest index eec90d12..42dd51d2 100644 --- a/tests/runtest/test_suite-run-order.shtest +++ b/tests/runtest/test_suite-run-order.shtest @@ -2,7 +2,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite-run-under.shtest b/tests/runtest/test_suite-run-under.shtest index 5b9a628a..25514677 100644 --- a/tests/runtest/test_suite-run-under.shtest +++ b/tests/runtest/test_suite-run-under.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: not lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ @@ -18,7 +17,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -33,7 +31,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite-use-perf.shtest b/tests/runtest/test_suite-use-perf.shtest index bda9c528..2a1f3660 100644 --- a/tests/runtest/test_suite-use-perf.shtest +++ b/tests/runtest/test_suite-use-perf.shtest @@ -2,7 +2,6 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ diff --git a/tests/runtest/test_suite.shtest b/tests/runtest/test_suite.shtest index 5226b87d..0a78f667 100644 --- a/tests/runtest/test_suite.shtest +++ b/tests/runtest/test_suite.shtest @@ -2,7 +2,7 @@ # RUN: rm -rf %t.SANDBOX # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -51,7 +51,7 @@ # Use the same sandbox again with --no-configure # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ +# RUN: --build-dir %t.SANDBOX/build \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ @@ -66,7 +66,6 @@ # RUN: rm -rf %t.SANDBOX2 # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX2 \ -# RUN: --no-timestamp \ # RUN: --no-configure \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ diff --git a/tests/runtest/test_suite_diagnose.shtest b/tests/runtest/test_suite_diagnose.shtest index cbc50123..1b2f83b0 100644 --- a/tests/runtest/test_suite_diagnose.shtest +++ b/tests/runtest/test_suite_diagnose.shtest @@ -7,7 +7,6 @@ # Check --diagnose requires --only-test # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \ @@ -21,7 +20,6 @@ # Check a basic nt run. # RUN: lnt runtest test-suite \ # RUN: --sandbox %t.SANDBOX \ -# RUN: --no-timestamp \ # RUN: --test-suite %S/Inputs/test-suite-cmake \ # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \ # RUN: --use-cmake %S/Inputs/test-suite-cmake/fake-diagnose-cmake \