Ensure temporary data files are put in the right place.

Bail on the first error.

svn path=/trunk/iconv/; revision=5693

3 files changed, 16 insertions, 14 deletions

diff --git a/test/GNU/Makefile b/test/GNU/Makefile
index 99fb722..d6ebaf7 100644
--- a/test/GNU/Makefile
+++ b/test/GNU/Makefile
@@ -60,7 +60,7 @@ TARGET_TESTS := $(TARGET_TESTS) test_$(d)
 test_$(d): $(d) $(addprefix $(d), $(TESTS_$(d)))
 	$(TOP)/$<check-stateless $(TOP) $(TOP)/$< ASCII
 #	/* General multi-byte encodings */
-	$(TOP)/$<genutf8 > UTF-8.TXT && $(TOP)/$<check-stateless $(TOP) $(TOP)/$< UTF-8
+	$(TOP)/$<genutf8 > $(TOP)/$<UTF-8.TXT && $(TOP)/$<check-stateless $(TOP) $(TOP)/$< UTF-8
 	$(TOP)/$<check-stateful $(TOP) $(TOP)/$< UCS-2BE
 	$(TOP)/$<check-stateful $(TOP) $(TOP)/$< UCS-2LE
 	$(TOP)/$<check-stateful $(TOP) $(TOP)/$< UCS-4BE
diff --git a/test/GNU/check-stateful b/test/GNU/check-stateful
index 027b52c..97c9477 100755
--- a/test/GNU/check-stateful
+++ b/test/GNU/check-stateful
@@ -18,9 +18,9 @@ my $charset = shift @ARGV;
 my $charsetf = $charset;
 $charsetf =~ s/:/-/g;
 
-`$top/Iconv -f $charset -t UTF-8 -o tmp-snippet $srcdir/$charsetf-snippet`;
-`cmp $srcdir/$charsetf-snippet.UTF-8 tmp-snippet`;
-`$top/Iconv -f UTF-8 -t $charset -o tmp-snippet $srcdir/$charsetf-snippet.UTF-8`;
-`cmp $srcdir/$charsetf-snippet tmp-snippet`;
-`rm -f tmp-snippet`;
+`$top/Iconv -f $charset -t UTF-8 -o $srcdir/tmp-snippet $srcdir/$charsetf-snippet`;
+`cmp $srcdir/$charsetf-snippet.UTF-8 $srcdir/tmp-snippet`;
+`$top/Iconv -f UTF-8 -t $charset -o $srcdir/tmp-snippet $srcdir/$charsetf-snippet.UTF-8`;
+`cmp $srcdir/$charsetf-snippet $srcdir/tmp-snippet`;
+`rm -f $srcdir/tmp-snippet`;
 
diff --git a/test/GNU/check-stateless b/test/GNU/check-stateless
index 53a5888..42479ed 100755
--- a/test/GNU/check-stateless
+++ b/test/GNU/check-stateless
@@ -19,25 +19,25 @@ my $charsetf = $charset;
 $charsetf =~ s/:/-/g;
 
 # iconv in one direction.
-command("$srcdir/table-from $charset > tmp-$charsetf.TXT");
+command("$srcdir/table-from $charset > $srcdir/tmp-$charsetf.TXT");
 
 # iconv in the other direction.
-command("$srcdir/table-to $charset | sort > tmp-$charsetf.INVERSE.TXT");
+command("$srcdir/table-to $charset | sort > $srcdir/tmp-$charsetf.INVERSE.TXT");
 
 # Check 1: charmap and iconv forward should be identical.
-command("cmp $srcdir/$charsetf.TXT tmp-$charsetf.TXT 2> /dev/null");
+command("cmp $srcdir/$charsetf.TXT $srcdir/tmp-$charsetf.TXT 2> /dev/null");
 
 # Check 2: the difference between the charmap and iconv backward.
-command("sed -e '/	.* 0x/d' < $srcdir/$charsetf.TXT > tmp-noprecomposed-$charsetf.TXT");
+command("sed -e '/	.* 0x/d' < $srcdir/$charsetf.TXT > $srcdir/tmp-noprecomposed-$charsetf.TXT");
 
 if (-f "$srcdir/$charsetf.IRREVERSIBLE.TXT") {
-	command("cat tmp-noprecomposed-$charsetf.TXT $srcdir/$charsetf.IRREVERSIBLE.TXT | sort | uniq -u > tmp-orig-$charsetf.INVERSE.TXT");
+	command("cat $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/$charsetf.IRREVERSIBLE.TXT | sort | uniq -u > $srcdir/tmp-orig-$charsetf.INVERSE.TXT");
 } else {
-	command("cp tmp-noprecomposed-$charsetf.TXT tmp-orig-$charsetf.INVERSE.TXT");
+	command("cp $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/tmp-orig-$charsetf.INVERSE.TXT");
 }
-command("cmp tmp-orig-$charsetf.INVERSE.TXT tmp-$charsetf.INVERSE.TXT 2> /dev/null");
+command("cmp $srcdir/tmp-orig-$charsetf.INVERSE.TXT $srcdir/tmp-$charsetf.INVERSE.TXT 2> /dev/null");
 
-command("rm -f tmp-$charsetf.TXT tmp-$charsetf.INVERSE.TXT tmp-noprecomposed-$charsetf.TXT tmp-orig-$charsetf.INVERSE.TXT");
+command("rm -f $srcdir/tmp-$charsetf.TXT $srcdir/tmp-$charsetf.INVERSE.TXT $srcdir/tmp-noprecomposed-$charsetf.TXT $srcdir/tmp-orig-$charsetf.INVERSE.TXT");
 
 sub command {
 	my $cmd = shift;
@@ -46,6 +46,8 @@ sub command {
 	foreach my $line (@output) {
 		print "| $line";
 	}
+	my $status = $? / 256;
+	die "$cmd:\nexit status $status\n" if $status;
 	return @output;
 }