From 67c311bd014889882fe76e4b25230b6386f07adf Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 4 Dec 2022 14:19:08 -0800
Subject: Fix broken tests

---
 test/option/fixture/SConstruct__taskmastertrace    | 9 +++++++++
 test/option/fixture/SConstruct__taskmastertrace.py | 9 ---------
 test/option/option--experimental.py                | 7 ++++---
 test/option/taskmastertrace.py                     | 2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 test/option/fixture/SConstruct__taskmastertrace
 delete mode 100644 test/option/fixture/SConstruct__taskmastertrace.py

diff --git a/test/option/fixture/SConstruct__taskmastertrace b/test/option/fixture/SConstruct__taskmastertrace
new file mode 100644
index 0000000..91e8c91
--- /dev/null
+++ b/test/option/fixture/SConstruct__taskmastertrace
@@ -0,0 +1,9 @@
+DefaultEnvironment(tools=[])
+env = Environment(tools=[])
+
+# We name the files 'Tfile' so that they will sort after the SConstruct
+# file regardless of whether the test is being run on a case-sensitive
+# or case-insensitive system.
+
+env.Command('Tfile.out', 'Tfile.mid', Copy('$TARGET', '$SOURCE'))
+env.Command('Tfile.mid', 'Tfile.in', Copy('$TARGET', '$SOURCE'))
diff --git a/test/option/fixture/SConstruct__taskmastertrace.py b/test/option/fixture/SConstruct__taskmastertrace.py
deleted file mode 100644
index 91e8c91..0000000
--- a/test/option/fixture/SConstruct__taskmastertrace.py
+++ /dev/null
@@ -1,9 +0,0 @@
-DefaultEnvironment(tools=[])
-env = Environment(tools=[])
-
-# We name the files 'Tfile' so that they will sort after the SConstruct
-# file regardless of whether the test is being run on a case-sensitive
-# or case-insensitive system.
-
-env.Command('Tfile.out', 'Tfile.mid', Copy('$TARGET', '$SOURCE'))
-env.Command('Tfile.mid', 'Tfile.in', Copy('$TARGET', '$SOURCE'))
diff --git a/test/option/option--experimental.py b/test/option/option--experimental.py
index 51f3546..324de99 100644
--- a/test/option/option--experimental.py
+++ b/test/option/option--experimental.py
@@ -36,12 +36,13 @@ test.file_fixture('fixture/SConstruct__experimental', 'SConstruct')
 tests = [
     ('.', []),
     ('--experimental=ninja', ['ninja']),
-    ('--experimental=all', ['ninja', 'transporter', 'warp_speed']),
+    ('--experimental=tm_v2', ['tm_v2']),
+    ('--experimental=all', ['ninja', 'tm_v2', 'transporter', 'warp_speed']),
     ('--experimental=none', []),
 ]
 
 for args, exper in tests:
-    read_string = """All Features=ninja,transporter,warp_speed
+    read_string = """All Features=ninja,tm_v2,transporter,warp_speed
 Experimental=%s
 """ % (exper)
     test.run(arguments=args,
@@ -50,7 +51,7 @@ Experimental=%s
 test.run(arguments='--experimental=warp_drive',
          stderr="""usage: scons [OPTIONS] [VARIABLES] [TARGETS]
 
-SCons Error: option --experimental: invalid choice: 'warp_drive' (choose from 'all','none','ninja','transporter','warp_speed')
+SCons Error: option --experimental: invalid choice: 'warp_drive' (choose from 'all','none','ninja','tm_v2','transporter','warp_speed')
 """,
          status=2)
 
diff --git a/test/option/taskmastertrace.py b/test/option/taskmastertrace.py
index f30d725..99de718 100644
--- a/test/option/taskmastertrace.py
+++ b/test/option/taskmastertrace.py
@@ -33,7 +33,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-test.file_fixture('fixture/SConstruct__taskmastertrace.py', 'SConstruct')
+test.file_fixture('fixture/SConstruct__taskmastertrace', 'SConstruct')
 test.file_fixture('fixture/taskmaster_expected_stdout_1.txt', 'taskmaster_expected_stdout_1.txt')
 test.file_fixture('fixture/taskmaster_expected_file_1.txt', 'taskmaster_expected_file_1.txt')
 test.file_fixture('fixture/taskmaster_expected_new_parallel.txt', 'taskmaster_expected_new_parallel.txt')
-- 
cgit v0.12