Steven checked in some changes yesterday which fixed a great number of

[scons.git] / test / option-r.py

diff --git a/test/option-r.py b/test/option-r.py
index d68f42997c5ee187cd638de12cbb41274021bcb1..0c124d121ea4ad68880744c353ea0cca54d7ee68 100644 (file)
--- a/test/option-r.py
+++ b/test/option-r.py
@@ -1,26 +1,46 @@
 #!/usr/bin/env python
-
-__revision__ = "test/option-r.py __REVISION__ __DATE__ __DEVELOPER__"
-
-import TestCmd
-import string
-import sys
-
-test = TestCmd.TestCmd(program = 'scons.py',
-                       workdir = '',
-                       interpreter = 'python')
+#
+# __COPYRIGHT__
+#
+# 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__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+
+test = TestSCons.TestSCons()
 
 test.write('SConstruct', "")
 
-test.run(chdir = '.', arguments = '-r')
+test.run(arguments = '-r .',
+         stderr = "Warning:  the -r option is not yet implemented\n")
 
-test.fail_test(test.stderr() !=
-               "Warning:  the -r option is not yet implemented\n")
-
-test.run(chdir = '.', arguments = '--no-builtin-rules')
-
-test.fail_test(test.stderr() !=
-               "Warning:  the --no-builtin-rules option is not yet implemented\n")
+test.run(arguments = '--no-builtin-rules .',
+         stderr = "Warning:  the --no-builtin-rules option is not yet implemented\n")
 
 test.pass_test()
  
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: