tests: allow '.write' to be directories
authorJean-Sebastien Gelinas <calestar@gmail.com>
Wed, 29 Jul 2009 19:43:26 +0000 (15:43 -0400)
committerJean Privat <jean@pryen.org>
Thu, 30 Jul 2009 17:25:57 +0000 (13:25 -0400)
Signed-off-by: Jean-Sebastien Gelinas <calestar@gmail.com>
Signed-off-by: Jean Privat <jean@pryen.org>

tests/sav/test_directory_create.sav [new file with mode: 0644]
tests/test_directory_create.nit [new file with mode: 0644]
tests/tests.sh

diff --git a/tests/sav/test_directory_create.sav b/tests/sav/test_directory_create.sav
new file mode 100644 (file)
index 0000000..9e75c73
--- /dev/null
@@ -0,0 +1,2 @@
+tmp_dir/
+tmp_file
diff --git a/tests/test_directory_create.nit b/tests/test_directory_create.nit
new file mode 100644 (file)
index 0000000..d2ab573
--- /dev/null
@@ -0,0 +1,23 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2009 Jean-Sebastien Gelinas <calestar@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"test_directory_create.write/tmp_dir".mkdir
+var f =  new OFStream.open("test_directory_create.write/tmp_file")
+f.write("test")
+f.close
+f =  new OFStream.open("test_directory_create.write/tmp_dir/tmp_file_2")
+f.write("other test")
+f.close
index 78188fd..8c00881 100755 (executable)
@@ -147,7 +147,7 @@ for ii in "$@"; do
 
                echo -n "=> $i: "
 
-               rm "$ff.res" "$ff.err" "$ff.write" "$ff.bin" 2> /dev/null
+               rm -rf "$ff.res" "$ff.err" "$ff.write" "$ff.bin" 2> /dev/null
 
                # Compile
                if [ "x$verbose" = "xtrue" ]; then
@@ -184,6 +184,8 @@ for ii in "$@"; do
                        fi
                        if [ -f "$ff.write" ]; then
                                cat "$ff.write" >> "$ff.res"
+                       elif [ -d "$ff.write" ]; then
+                               ls -F $ff.write >> "$ff.res"
                        fi
                        if [ -s "$ff.err" ]; then
                                cat "$ff.err" >> "$ff.res"
@@ -214,6 +216,8 @@ for ii in "$@"; do
                                        fi
                                        if [ -f "$fff.write" ]; then
                                                cat "$fff.write" >> "$fff.res"
+                                       elif [ -d "$fff.write" ]; then
+                                               ls -F $fff.write >> "$fff.res"
                                        fi
                                        if [ -s "$fff.err" ]; then
                                                cat "$fff.err" >> "$fff.res"