From aacc6d0c3fb751d91f928c359ff455fa7b77500b Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Mon, 19 Jan 2009 15:19:33 +0000
Subject: Move test/option-h.py to test/option/h.py and clean up an unnecessary
 import.

---
 test/option-h.py | 59 --------------------------------------------------------
 test/option/h.py | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 test/option-h.py
 create mode 100644 test/option/h.py

diff --git a/test/option-h.py b/test/option-h.py
deleted file mode 100644
index 7b36c24..0000000
--- a/test/option-h.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env 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
-import string
-import sys
-
-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()
diff --git a/test/option/h.py b/test/option/h.py
new file mode 100644
index 0000000..bf6a6ae
--- /dev/null
+++ b/test/option/h.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env 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 string
+
+import TestSCons
+
+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()
-- 
cgit v0.12