Commits

Anonymous committed 2d65d36

Display the help message when -u -h is supplied. (Elliot Murphy)

  • Participants
  • Parent commits 7482de6

Comments (0)

Files changed (3)

   - Enhance the tests to guarantee persistence of ListOption
     values in saved options files.
 
+  - Supply the help text when -h is used with the -u, -U or -D options.
+
   From Christian Neeb:
 
   - Fix the Java parser's handling of string definitions to avoid ignoring

src/engine/SCons/Script/Main.py

         if script_dir:
             display("scons: Entering directory `%s'" % script_dir)
             os.chdir(script_dir)
-        else:
-            raise SCons.Errors.UserError, "No SConstruct file found."
 
     fs.set_toplevel_dir(os.getcwd())
 
 test = TestSCons.TestSCons()
 
 test.run(arguments = '-h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
+test.run(arguments = '-u -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-U -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-D -h')
 test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
 test.write('SConstruct', "")
 
 test.run(arguments = '-h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
+test.run(arguments = '-u -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-U -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-D -h')
 test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
 test.pass_test()
-