Updated jni header directory expectations for tests.

    My openjdk install link/dir also contained the architecture.
    Example: RPM package java-1.7.0-openjdk-devel-1.7.0.75-2.5.4.0.el6_6.x86_64
             created link /usr/lib/jvm/java-1.7.0-openjdk.x86_64

    Affected tests:
        test/Java/multi-step.py
        test/Java/swig-dependencies.py

1 files changed, 226 insertions, 0 deletions

diff --git a/test/Delete.py b/test/Delete.py
new file mode 100644
index 000000000..94ba24aae
--- /dev/null
+++ b/test/Delete.py
@@ -0,0 +1,226 @@
+#!/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__"
+
+"""
+Verify that the Delete() Action works.
+"""
+
+import sys
+import os.path
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+Execute(Delete('f1'))
+Execute(Delete('d2'))
+Execute(Delete('symlinks/filelink'))
+Execute(Delete('symlinks/brokenlink'))
+Execute(Delete('symlinks/dirlink'))
+
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+Cat = Action(cat)
+env = Environment()
+env.Command('f3.out', 'f3.in', [Cat, Delete("f4"), Delete("d5")])
+env = Environment(FILE='f6', DIR='d7')
+env.Command('f8.out', 'f8.in', [Delete("$FILE"), Delete("$DIR"), Cat])
+env.Command('f9.out', 'f9.in', [Cat,
+                                Delete("Delete-$SOURCE"),
+                                Delete("$TARGET-Delete")])
+
+env.Command('f10-nonexistent.out', 'f10.in',
+            [Delete("$TARGET"), Cat])
+
+env.Command(Dir('d11-nonexistent.out'), 'd11.in',
+            [Delete("$TARGET"), Mkdir("$TARGET")])
+
+env.Command('f12-nonexistent.out', 'f12.in',
+            [Delete("$TARGET", must_exist=0), Cat])
+
+env.Command(Dir('d13-nonexistent.out'), 'd13.in',
+            [Delete("$TARGET", must_exist=0), Mkdir("$TARGET")])
+
+# Make sure Delete works with a list of arguments
+env = Environment(FILE='f14', DIR='d15')
+env.Command('f16.out', 'f16.in', [Delete(["$FILE", "$DIR"]), Cat])
+""")
+
+test.write('f1', "f1\n")
+test.subdir('d2')
+test.write(['d2', 'file'], "d2/file\n")
+test.write('f3.in', "f3.in\n")
+test.write('f4', "f4\n")
+test.subdir('d5')
+test.write(['d5', 'file'], "d5/file\n")
+test.write('f6', "f6\n")
+test.subdir('d7')
+test.write(['d7', 'file'], "d7/file\n")
+test.write('f8.in', "f8.in\n")
+test.write('f9.in', "f9.in\n")
+test.write('Delete-f9.in', "Delete-f9.in\n")
+test.write('f9.out-Delete', "f9.out-Delete\n")
+test.write('f10.in', "f10.in\n")
+test.subdir('d11.in')
+test.write('f12.in', "f12.in\n")
+test.subdir('d13.in')
+test.write('f14', "f14\n")
+test.subdir('d15')
+test.write('f16.in', "f16.in\n")
+test.subdir('symlinks')
+test.subdir('symlinks/dirtarget')
+test.write('symlinks/dirtarget/dircontent', 'dircontent content\n')
+test.write('symlinks/filetarget', 'filetarget content\n')
+test.symlink('filetarget', 'symlinks/filelink')
+test.symlink('dirtarget', 'symlinks/dirlink')
+test.symlink('brokentarget', 'symlinks/brokenlink')
+
+expect = test.wrap_stdout(read_str = """\
+Delete("f1")
+Delete("d2")
+Delete("symlinks/filelink")
+Delete("symlinks/brokenlink")
+Delete("symlinks/dirlink")
+""",
+                          build_str = """\
+Delete("d11-nonexistent.out")
+Mkdir("d11-nonexistent.out")
+Delete("d13-nonexistent.out")
+Mkdir("d13-nonexistent.out")
+Delete("f10-nonexistent.out")
+cat(["f10-nonexistent.out"], ["f10.in"])
+Delete("f12-nonexistent.out")
+cat(["f12-nonexistent.out"], ["f12.in"])
+Delete(["f14", "d15"])
+cat(["f16.out"], ["f16.in"])
+cat(["f3.out"], ["f3.in"])
+Delete("f4")
+Delete("d5")
+Delete("f6")
+Delete("d7")
+cat(["f8.out"], ["f8.in"])
+cat(["f9.out"], ["f9.in"])
+Delete("Delete-f9.in")
+Delete("f9.out-Delete")
+""")
+test.run(options = '-n', arguments = '.', stdout = expect)
+
+test.must_exist('f1')
+test.must_exist('d2')
+test.must_exist(os.path.join('d2', 'file'))
+test.must_not_exist('f3.out')
+test.must_exist('f4')
+test.must_exist('d5')
+test.must_exist(os.path.join('d5', 'file'))
+test.must_exist('f6')
+test.must_exist('d7')
+test.must_exist(os.path.join('d7', 'file'))
+test.must_not_exist('f8.out')
+test.must_not_exist('f9.out')
+test.must_exist('Delete-f9.in')
+test.must_exist('f9.out-Delete')
+test.must_exist('f14')
+test.must_exist('d15')
+test.must_not_exist('f16.out')
+if sys.platform != 'win32':
+    test.must_exist('symlinks')
+    test.must_exist('symlinks/dirtarget')
+    test.must_exist('symlinks/dirtarget/dircontent')
+    test.must_exist('symlinks/filetarget')
+    test.must_exist('symlinks/filelink')
+    test.must_exist('symlinks/brokenlink')
+    test.must_exist('symlinks/dirlink')
+
+test.run()
+
+test.must_not_exist('f1')
+test.must_not_exist('d2')
+test.must_not_exist(os.path.join('d2', 'file'))
+test.must_match('f3.out', "f3.in\n")
+test.must_not_exist('f4')
+test.must_not_exist('d5')
+test.must_not_exist(os.path.join('d5', 'file'))
+test.must_not_exist('f6')
+test.must_not_exist('d7')
+test.must_not_exist(os.path.join('d7', 'file'))
+test.must_match('f8.out', "f8.in\n")
+test.must_match('f9.out', "f9.in\n")
+test.must_not_exist('Delete-f9.in')
+test.must_not_exist('f9.out-Delete')
+test.must_exist('f10-nonexistent.out')
+test.must_exist('d11-nonexistent.out')
+test.must_exist('f12-nonexistent.out')
+test.must_exist('d13-nonexistent.out')
+test.must_not_exist('f14')
+test.must_not_exist('d15')
+test.must_match('f16.out', "f16.in\n")
+if sys.platform != 'win32':
+    test.must_exist('symlinks')
+    test.must_exist('symlinks/dirtarget')
+    test.must_exist('symlinks/dirtarget/dircontent')
+    test.must_exist('symlinks/filetarget')
+    test.must_not_exist('symlinks/filelink')
+    test.must_not_exist('symlinks/brokenlink')
+    test.must_not_exist('symlinks/dirlink')
+
+test.write("SConstruct", """\
+def cat(env, source, target):
+    target = str(target[0])
+    f = open(target, "wb")
+    for src in source:
+        f.write(open(str(src), "rb").read())
+    f.close()
+Cat = Action(cat)
+env = Environment()
+env.Command('f14-nonexistent.out', 'f14.in', [Delete("$TARGET", must_exist=1),
+                                              Cat])
+""")
+
+test.write('f14.in', "f14.in\n")
+
+test.run(status=2, stderr=None)
+
+fail_strings = [
+    "No such file or directory",
+    "The system cannot find the file specified",
+    "The system cannot find the path specified",
+    "Das System kann die angegebene Datei nicht finden",
+]
+
+test.must_contain_any_line(test.stderr(), fail_strings)
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: