.

diff --git a/tests/join/Makefile b/tests/join/Makefile
index 391f1a04f17c1f5669e4c84e456b6e2b3e24370e..683b343a80616fbbf36a5233e153bf5cb51c97d7 100644 (file)
--- a/tests/join/Makefile
+++ b/tests/join/Makefile
@@ -1,8 +1,8 @@
 .PHONY: all
-all: tr-tests
-       ./tr-tests
+all: join-tests
+       ./join-tests
 
-tr-tests: main build-script test.data.pl
+join-tests: main build-script test.data.pl
        ./main test.data.pl > $@.n
        mv $@.n $@
        chmod 755 $@
@@ -16,4 +16,4 @@ clean: distclean
 
 .PHONY: realclean
 realclean: clean
-       rm -f tr-tests t*.in t*.exp
+       rm -f join-tests t*.in t*.exp

diff --git a/tests/join/TODO b/tests/join/TODO
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..265ea4799030c290fa81231d257233aba5b9379a 100644 (file)
--- a/tests/join/TODO
+++ b/tests/join/TODO
@@ -0,0 +1,2 @@
+rename tr-tests
+make sure all test_names are distinct!

diff --git a/tests/join/build-script b/tests/join/build-script
index 1e0e6776574247655770d0001ad6483377db16b4..01fbd2e02c9f167b77eb86b158912d8467d6e8f8 100755 (executable)
--- a/tests/join/build-script
+++ b/tests/join/build-script
@@ -1,13 +1,16 @@
 #!/p/bin/perl5.000 -w
 
-$join = '/usr/bin/join';
 $join = 'join';
+$join = '/usr/bin/join';
+$join = './join';
 $test = 0;
 $| = 1;
 
 print ":\nerrors=0\n";
 $expected = '';
 $flags = '';
+$f1 = '';
+$f2 = '';
 
 while (<>)
   {

diff --git a/tests/join/test.data.pl b/tests/join/test.data.pl
index 50413bd0e85df50a4540c96f9ccbd88582aba013..27815af7b849934ab2a8f1f68a352504279763cf 100755 (executable)
--- a/tests/join/test.data.pl
+++ b/tests/join/test.data.pl
@@ -1,4 +1,11 @@
+# TODO: make sure all test_names are unique!!!!
 # test name
 #     flags       file-1 file-2    expected output   expected return code
 #
-("1", '-a1 -a2',  "a 1\n", "b\n",   "a 1\nb\n",              0);
+('1a', '-a1',      "a 1\n", "b\n",   "a 1\n",          0);
+('1b', '-a2',      "a 1\n", "b\n",   "b\n",            0); # Got "\n"
+('1c', '-a1 -a2',  "a 1\n", "b\n",   "a 1\nb\n",       0); # Got "a 1\n\n"
+
+('2a', '-a1 -e .',  "a\nb\nc\n", "a x y\nb\nc\n", "a x y\nb\nc\n", 0);
+('2b', '-a1 -e . -o 2.1,2.2,2.3',  "a\nb\nc\n", "a x y\nb\nc\n", "a x y\nb . .\nc . .\n", 0);
+('2c', '-a1 -e . -o 2.1,2.2,2.3',  "a\nb\nc\nd\n", "a x y\nb\nc\n", "a x y\nb . .\nc . .\nd\n", 0);