review feedback: legacysched to legacy_sched

7 files changed, 12 insertions, 12 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index cee9947..d0a8593 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -63,7 +63,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
   From Andrew Morrow:
     - The NewParallel scheduler is now the default, the `tm_v2` flag is removed,
-      and the old scheduler is opt-in under `--experimental=legacysched`. Additionally,
+      and the old scheduler is opt-in under `--experimental=legacy_sched`. Additionally,
       the new scheduler is now used for -j1 builds as well.
 
 RELEASE 4.6.0 -  Sun, 19 Nov 2023 17:22:20 -0700
diff --git a/SCons/Script/SConsOptions.py b/SCons/Script/SConsOptions.py
index 25675f3..18fe0e4 100644
--- a/SCons/Script/SConsOptions.py
+++ b/SCons/Script/SConsOptions.py
@@ -40,7 +40,7 @@ SUPPRESS_HELP = optparse.SUPPRESS_HELP
 
 diskcheck_all = SCons.Node.FS.diskcheck_types()
 
-experimental_features = {'warp_speed', 'transporter', 'ninja', 'legacysched'}
+experimental_features = {'warp_speed', 'transporter', 'ninja', 'legacy_sched'}
 
 
 def diskcheck_convert(value):
diff --git a/SCons/Taskmaster/Job.py b/SCons/Taskmaster/Job.py
index 60992be..3bcc803 100644
--- a/SCons/Taskmaster/Job.py
+++ b/SCons/Taskmaster/Job.py
@@ -74,7 +74,7 @@ class Jobs:
     def __init__(self, num, taskmaster) -> None:
         """
         Create 'num' jobs using the given taskmaster. The exact implementation
-        used varies with the number of jobs requested and the state of the `legacysched` flag
+        used varies with the number of jobs requested and the state of the `legacy_sched` flag
         to `--experimental`.
         """
 
@@ -88,7 +88,7 @@ class Jobs:
             stack_size = default_stack_size
 
         experimental_option = GetOption('experimental') or []
-        if 'legacysched' in experimental_option:
+        if 'legacy_sched' in experimental_option:
             if num > 1:
                 self.job = LegacyParallel(taskmaster, num, stack_size)
             else:
diff --git a/SCons/Taskmaster/JobTests.py b/SCons/Taskmaster/JobTests.py
index 52118d9..3743866 100644
--- a/SCons/Taskmaster/JobTests.py
+++ b/SCons/Taskmaster/JobTests.py
@@ -483,7 +483,7 @@ class SerialTaskTest(_SConsTaskTest):
         self._test_seq(1)
 
         # Now run test with LegacyParallel
-        OptionsParser.values.experimental=['legacysched']
+        OptionsParser.values.experimental=['legacy_sched']
         self._test_seq(1)
 
 class ParallelTaskTest(_SConsTaskTest):
@@ -492,7 +492,7 @@ class ParallelTaskTest(_SConsTaskTest):
         self._test_seq(num_jobs)
 
         # Now run test with LegacyParallel
-        OptionsParser.values.experimental=['legacysched']
+        OptionsParser.values.experimental=['legacy_sched']
         self._test_seq(num_jobs)
 
 
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 9432dbe..6808cd2 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -1212,7 +1212,7 @@ the mechanisms in the specified order.</para>
         The default setting is <literal>none</literal>.</para>
       <para>Current available features are:
         <literal>ninja</literal> (<emphasis>New in version 4.2</emphasis>),
-        <literal>legacysched</literal> (<emphasis>New in version 4.6.0</emphasis>).
+        <literal>legacy_sched</literal> (<emphasis>New in version 4.6.0</emphasis>).
       </para>
       <caution><para>
         No Support offered for any features or tools enabled by this flag.
diff --git a/test/option/option--experimental.py b/test/option/option--experimental.py
index 2929eeb..da0f0a5 100755
--- a/test/option/option--experimental.py
+++ b/test/option/option--experimental.py
@@ -36,13 +36,13 @@ test.file_fixture('fixture/SConstruct__experimental', 'SConstruct')
 tests = [
     ('.', []),
     ('--experimental=ninja', ['ninja']),
-    ('--experimental=legacysched', ['legacysched']),
-    ('--experimental=all', ['legacysched', 'ninja', 'transporter', 'warp_speed']),
+    ('--experimental=legacy_sched', ['legacy_sched']),
+    ('--experimental=all', ['legacy_sched', 'ninja', 'transporter', 'warp_speed']),
     ('--experimental=none', []),
 ]
 
 for args, exper in tests:
-    read_string = """All Features=legacysched,ninja,transporter,warp_speed
+    read_string = """All Features=legacy_sched,ninja,transporter,warp_speed
 Experimental=%s
 """ % (exper)
     test.run(arguments=args,
@@ -51,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','legacysched','ninja','transporter','warp_speed')
+SCons Error: option --experimental: invalid choice: 'warp_drive' (choose from 'all','none','legacy_sched','ninja','transporter','warp_speed')
 """,
          status=2)
 
diff --git a/test/option/taskmastertrace.py b/test/option/taskmastertrace.py
index 9ff3d37..25d4e2f 100755
--- a/test/option/taskmastertrace.py
+++ b/test/option/taskmastertrace.py
@@ -52,7 +52,7 @@ Copy("Tfile.out", "Tfile.mid")
 """)
 
 # Test LegacyParallel Job implementation
-test.run(arguments='--experimental=legacysched --taskmastertrace=trace.out .', stdout=expect_stdout)
+test.run(arguments='--experimental=legacy_sched --taskmastertrace=trace.out .', stdout=expect_stdout)
 test.must_match_file('trace.out', 'taskmaster_expected_file_1.txt', mode='r')
 
 # Test NewParallel Job implementation