From 3455431cfe20fc19617cdce54a648b1be2b6e4dd Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Gelinas Date: Wed, 29 Jul 2009 15:43:26 -0400 Subject: [PATCH] tests: allow '.write' to be directories Signed-off-by: Jean-Sebastien Gelinas Signed-off-by: Jean Privat --- tests/sav/test_directory_create.sav | 2 ++ tests/test_directory_create.nit | 23 +++++++++++++++++++++++ tests/tests.sh | 6 +++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/sav/test_directory_create.sav create mode 100644 tests/test_directory_create.nit diff --git a/tests/sav/test_directory_create.sav b/tests/sav/test_directory_create.sav new file mode 100644 index 0000000..9e75c73 --- /dev/null +++ b/tests/sav/test_directory_create.sav @@ -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 index 0000000..d2ab573 --- /dev/null +++ b/tests/test_directory_create.nit @@ -0,0 +1,23 @@ +# This file is part of NIT ( http://www.nitlanguage.org ). +# +# Copyright 2009 Jean-Sebastien Gelinas +# +# 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 diff --git a/tests/tests.sh b/tests/tests.sh index 78188fd..8c00881 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -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" -- 1.7.9.5