X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=test%2Foption--override.py;h=6e94603a5570bc57a975231f215c67544f2e6a6b;hb=0289ee1a21e72070b6e22ca93c8c1a90b0a2d913;hp=ae94be9f70c649d8e7db5bba3f3af6302ade3277;hpb=f903d106a238f89c9e079ec9fa4a838209b27ce5;p=scons.git

diff --git a/test/option--override.py b/test/option--override.py
index ae94be9f..6e94603a 100644
--- a/test/option--override.py
+++ b/test/option--override.py
@@ -1,21 +1,39 @@
 #!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002, 2003 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 
-__revision__ = "test/option--override.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestCmd
+import TestSCons
 import string
 import sys
 
-test = TestCmd.TestCmd(program = 'scons.py',
-                       workdir = '',
-                       interpreter = 'python')
+test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-test.run(chdir = '.', arguments = '--override=foo')
-
-test.fail_test(test.stderr() !=
-		"Warning:  the --override option is not yet implemented\n")
+test.run(arguments = '--override=foo .',
+	 stderr = "Warning:  the --override option is not yet implemented\n")
 
 test.pass_test()