Update the verify script.

2 files changed, 162 insertions, 201 deletions

diff --git a/lib/libc_r/test/Makefile b/lib/libc_r/test/Makefile
index 18f9573..ef0090e 100644
--- a/lib/libc_r/test/Makefile
+++ b/lib/libc_r/test/Makefile
@@ -6,28 +6,22 @@
 
 # File lists.
 
-# Diff mode tests written in C.
-CDTESTS := hello_d.c mutex_d.c sem_d.c sigsuspend_d.c sigwait_d.c
+# Tests written in C.
+CTESTS := hello_d.c hello_s.c join_leak_d.c mutex_d.c sem_d.c sigsuspend_d.c \
+	sigwait_d.c
 
-# Sequence mode tests written in C.
-CSTESTS := hello_s.c
-
-# C programs that are used internally by the perl-based tests.  The build
-# system merely compiles these.
+# C programs that are used internally by the tests.  The build system merely
+# compiles these.
 BTESTS := hello_b.c
 
-# Diff mode tests written in perl.
-PDTESTS :=
-
-# Sequence mode tests written in perl.
-PSTESTS := propagate_s.pl
+# Tests written in perl.
+PTESTS := propagate_s.pl
 
 # Munge the file lists to their final executable names (strip the .c).
-CDTESTS := $(CDTESTS:R)
-CSTESTS := $(CSTESTS:R)
+CTESTS := $(CTESTS:R)
 BTESTS := $(BTESTS:R)
 
-CPPFLAGS := -D_LIBC_R_
+CPPFLAGS := -D_LIBC_R_ -D_REENTRANT
 CFLAGS := -Wall -pipe -g3
 LDFLAGS_A := -static
 LDFLAGS_P := -pg
@@ -49,7 +43,7 @@ all : default
 .PATH : .
 
 # Build the C programs.
-.for bin in $(CDTESTS) $(CSTESTS) $(BTESTS)
+.for bin in $(CTESTS) $(BTESTS)
 $(bin)_a : $(bin:S/$/&.c/)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(bin:S/$/&.c/) -o $(@:S/$/&.o/)
 	$(CC) -o $@ $(@:S/$/&.o/) $(LDFLAGS_A) $(LIBS)
@@ -67,11 +61,9 @@ $(bin)_s : $(bin:S/$/&.c/)
 .endfor
 
 # Dependency file inclusion.
-.for depfile in $(CDTESTS:R:S/$/&_a.d/) $(CSTESTS:R:S/$/&_a.d/) \
-		$(BTESTS:R:S/$/&_a.d/) $(CDTESTS:R:S/$/&_p.d/) \
-		$(CSTESTS:R:S/$/&_p.d/) $(BTESTS:R:S/$/&_p.d/) \
-		$(CDTESTS:R:S/$/&_s.d/) $(CSTESTS:R:S/$/&_s.d/) \
-		$(BTESTS:R:S/$/&_s.d/)
+.for depfile in $(CTESTS:R:S/$/&_a.d/) $(BTESTS:R:S/$/&_a.d/) \
+		$(CTESTS:R:S/$/&_p.d/) $(BTESTS:R:S/$/&_p.d/) \
+		$(CTESTS:R:S/$/&_s.d/) $(BTESTS:R:S/$/&_s.d/)
 .if exists($(depfile))
 .include "$(depfile)"
 .endif
@@ -79,32 +71,32 @@ $(bin)_s : $(bin:S/$/&.c/)
 
 default : check
 
-tests_a : $(CDTESTS:S/$/&_a/) $(CSTESTS:S/$/&_a/) $(BTESTS:S/$/&_a/)
-tests_p : $(CDTESTS:S/$/&_p/) $(CSTESTS:S/$/&_p/) $(BTESTS:S/$/&_p/)
-tests_s : $(CDTESTS:S/$/&_s/) $(CSTESTS:S/$/&_s/) $(BTESTS:S/$/&_s/)
+tests_a : $(CTESTS:S/$/&_a/) $(BTESTS:S/$/&_a/)
+tests_p : $(CTESTS:S/$/&_p/) $(BTESTS:S/$/&_p/)
+tests_s : $(CTESTS:S/$/&_s/) $(BTESTS:S/$/&_s/)
 
 tests : tests_a tests_p tests_s
 
 check_a : tests_a
-.for bin in $(CDTESTS) $(CSTESTS) $(BTESTS)
+.for bin in $(CTESTS) $(BTESTS)
 	@cp $(bin)_a $(bin)
 .endfor
 	@echo "Test static library:"
-	@./verify $(VFLAGS) -- -d $(CDTESTS) $(PDTESTS) -s $(CSTESTS) $(PSTESTS)
+	@./verify $(VFLAGS) $(CTESTS) $(PTESTS)
 
 check_p : tests_p
-.for bin in $(CDTESTS) $(CSTESTS) $(BTESTS)
+.for bin in $(CTESTS) $(BTESTS)
 	@cp $(bin)_p $(bin)
 .endfor
 	@echo "Test profile library:"
-	@./verify $(VFLAGS) -- -d $(CDTESTS) $(PDTESTS) -s $(CSTESTS) $(PSTESTS)
+	@./verify $(VFLAGS) $(CTESTS) $(PTESTS)
 
 check_s : tests_s
-.for bin in $(CDTESTS) $(CSTESTS) $(BTESTS)
+.for bin in $(CTESTS) $(BTESTS)
 	@cp $(bin)_s $(bin)
 .endfor
 	@echo "Test shared library:"
-	@./verify $(VFLAGS) -- -d $(CDTESTS) $(PDTESTS) -s $(CSTESTS) $(PSTESTS)
+	@./verify $(VFLAGS) $(CTESTS) $(PTESTS)
 
 check : check_a check_p check_s
 
@@ -115,9 +107,9 @@ clean :
 	rm -f *.perf
 	rm -f *.diff
 	rm -f *.gmon
-	rm -f $(CDTESTS) $(CSTESTS) $(BTESTS)
-	rm -f $(CDTESTS:S/$/&_a/) $(CSTESTS:S/$/&_a/) $(BTESTS:S/$/&_a/)
-	rm -f $(CDTESTS:S/$/&_p/) $(CSTESTS:S/$/&_p/) $(BTESTS:S/$/&_p/)
-	rm -f $(CDTESTS:S/$/&_s/) $(CSTESTS:S/$/&_s/) $(BTESTS:S/$/&_s/)
+	rm -f $(CTESTS) $(BTESTS)
+	rm -f $(CTESTS:S/$/&_a/) $(BTESTS:S/$/&_a/)
+	rm -f $(CTESTS:S/$/&_p/) $(BTESTS:S/$/&_p/)
+	rm -f $(CTESTS:S/$/&_s/) $(BTESTS:S/$/&_s/)
 	rm -f *.d
 	rm -f *.o
diff --git a/lib/libc_r/test/verify b/lib/libc_r/test/verify
index bf8d94a..2863e5c 100755
--- a/lib/libc_r/test/verify
+++ b/lib/libc_r/test/verify
@@ -2,7 +2,7 @@
 #-*-mode:perl-*-
 #############################################################################
 #
-# Copyright (C) 1999-2000 Jason Evans <jasone@freebsd.org>.
+# Copyright (C) 1999-2001 Jason Evans <jasone@freebsd.org>.
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@ $opt_help = 0;
 $opt_verbose = 0;
 $opt_quiet = 0;
 $opt_srcdir = ".";
+$opt_objdir = ".";
 $opt_ustats = 0;
 $opt_zero = 0;
 
@@ -59,42 +60,12 @@ $opt_retval =
 &GetOptions("h|help" => \$opt_help,
 	    "v|verbose" => \$opt_verbose,
 	    "q|quiet" => \$opt_quiet,
-            "s|srcdir=s" => \$opt_srcdir,
+	    "s|srcdir=s" => \$opt_srcdir,
+            "o|objdir=s" => \$opt_objdir,
 	    "u|ustats" => \$opt_ustats,
 	    "z|zero" => \$opt_zero
 	    );
 
-$mode = "d";
-for ($i = 0; $i <= $#ARGV; $i++)
-{
-    if (($ARGV[$i] eq "-s") || ($ARGV[$i] eq "--sequence"))
-    {
-	$mode = "s";
-    }
-    elsif (($ARGV[$i] eq "-d") || ($ARGV[$i] eq "--diff"))
-    {
-	$mode = "d";
-    }
-    elsif (-x $ARGV[$i])
-    {
-	if ($mode eq "s")
-	{
-	    @STESTS = (@STESTS, $ARGV[$i]);
-	}
-	else
-	{
-	    @DTESTS = (@DTESTS, $ARGV[$i]);
-	}
-    }
-    else
-    {
-	if (!$opt_quiet)
-	{
-	    print STDERR "Cannot run \"$ARGV[$i]\"\n";
-	}
-    }
-}
-
 if ($opt_help)
 {
     &usage();
@@ -114,7 +85,7 @@ if ($opt_verbose && $opt_quiet)
     exit 1;
 }
 
-if ($#STESTS + $#DTESTS + 2 == 0)
+if ($#ARGV + 1 == 0)
 {
     print STDERR "No tests specified\n";
     &usage();
@@ -123,10 +94,10 @@ if ($#STESTS + $#DTESTS + 2 == 0)
 
 if ($opt_verbose)
 {
-    print STDERR "Option values: h:$opt_help, v:$opt_verbose, q:$opt_quiet, "
-	. "u:$opt_ustats\n";
-    printf STDERR "Sequence tests (%d total): @STESTS\n", $#STESTS + 1;
-    printf STDERR "Diff tests (%d total): @DTESTS\n", $#DTESTS + 1;
+    print STDERR "Option values: h:$opt_help, v:$opt_verbose, "
+	. "s:\"$opt_srcdir\", o:\"$opt_objdir\" "
+	. "q:$opt_quiet, u:$opt_ustats, z:$opt_zero\n";
+    printf STDERR "Tests (%d total): @ARGV\n", $#ARGV + 1;
 }
 
 #
@@ -156,138 +127,130 @@ $total_hutime = 0.0; # Total historical user time.
 $total_hstime = 0.0; # Total historical system time.
 $total_ntime = 0.0; # Total time for tests that have historical data.
 
-foreach $test (@STESTS)
+foreach $test (@ARGV)
 {
-    # sequence mode.
-    $okay = 1;
+    # Strip out any whitespace in $test.
+    $test =~ s/^\s*(.*)\s*$/$1/;
 
-    ($okay, $utime, $stime) = &run_test($test);
+    $okay = 1;
 
-    if (open (STEST_OUT, "<./$test.out"))
+    if (-e "$opt_srcdir/$test.exp")
     {
-	$num_failed_subtests = 0;
+	# Diff mode.
 
-	$_ = <STEST_OUT>;
+	($okay, $utime, $stime) = &run_test($test);
 
-	if ($_ =~ /1\.\.(\d+)/)
+	if (-e "$opt_objdir/$test.out")
 	{
-	    $num_subtests = $1;
+	    `diff $opt_srcdir/$test.exp $opt_objdir/$test.out > $opt_objdir/$test.diff 2>&1`;
+	    if ($?)
+	    {
+		# diff returns non-zero if there is a difference.
+		$okay = 0;
+	    }
 	}
 	else
 	{
-	    $num_subtests = 0;
 	    $okay = 0;
 	    if ($opt_verbose)
 	    {
-		print STDERR "Malformed 1..n line: \"$_\"\n";
+		print STDERR
+		    "Nonexistent output file \"$opt_objdir/$test.out\"\n";
 	    }
 	}
-	for ($subtest = 1; $subtest <= $num_subtests; $subtest++)
+
+	($hutime, $hstime) = &print_stats($test, $okay, 0, 0, $utime, $stime);
+    }
+    else
+    {
+	# Sequence mode.
+
+	($okay, $utime, $stime) = &run_test($test);
+
+	if (open (STEST_OUT, "<$opt_objdir/$test.out"))
 	{
+	    $num_subtests = 0;
+	    $num_failed_subtests = 0;
+
 	    while (defined($line = <STEST_OUT>))
 	    {
-		if ($line =~ /^not\s+ok\s+(\d+)?/)
+		if ($line =~ /1\.\.(\d+)/)
 		{
-		    $not = 1;
-		    $test_num = $1;
+		    $num_subtests = $1;
 		    last;
 		}
-		elsif ($line =~ /^ok\s+(\d+)?/)
+	    }
+	    if ($num_subtests == 0)
+	    {
+		$okay = 0;
+		if ($opt_verbose)
 		{
-		    $not = 0;
-		    $test_num = $1;
-		    last;
+		    print STDERR "Malformed or missing 1..n line\n";
 		}
 	    }
-	    if (defined($line))
+	    else
 	    {
-		if (defined($test_num) && ($test_num != $subtest))
+		for ($subtest = 1; $subtest <= $num_subtests; $subtest++)
 		{
-		    # There was no output printed for one or more tests.
-		    for (; $subtest < $test_num; $subtest++)
+		    while (defined($line = <STEST_OUT>))
 		    {
-			$num_failed_subtests++;
+			if ($line =~ /^not\s+ok\s+(\d+)?/)
+			{
+			    $not = 1;
+			    $test_num = $1;
+			    last;
+			}
+			elsif ($line =~ /^ok\s+(\d+)?/)
+			{
+			    $not = 0;
+			    $test_num = $1;
+			    last;
+			}
+		    }
+		    if (defined($line))
+		    {
+			if (defined($test_num) && ($test_num != $subtest))
+			{
+			    # There was no output printed for one or more tests.
+			    for (; $subtest < $test_num; $subtest++)
+			    {
+				$num_failed_subtests++;
+			    }
+			}
+			if ($not)
+			{
+			    $num_failed_subtests++;
+			}
+		    }
+		    else
+		    {
+			for (; $subtest <= $num_subtests; $subtest++)
+			{
+			    $num_failed_subtests++;
+			}
 		    }
 		}
-		if ($not)
-		{
-		    $num_failed_subtests++;
-		}
-	    }
-	    else
-	    {
-		for (; $subtest <= $num_subtests; $subtest++)
+
+		if (0 < $num_failed_subtests)
 		{
-		    $num_failed_subtests++;
+		    $okay = 0;
 		}
 	    }
 	}
-
-	if (0 < $num_failed_subtests)
-	{
-	    $okay = 0;
-	}
-    }
-    else
-    {
-	if (!$opt_quiet)
+	else
 	{
-	    print STDERR "Cannot open output file \"$test.out\"\n";
+	    if (!$opt_quiet)
+	    {
+		print STDERR "Cannot open output file \"$opt_objdir/$test.out\"\n";
+	    }
+	    exit 1;
 	}
-	exit 1;
-    }
-
-    ($hutime, $hstime) = &print_stats($test, $okay, 
-				      $num_failed_subtests, $num_subtests,
-				      $utime, $stime);
-    $total_hutime += $hutime;
-    $total_hstime += $hstime;
-
-    if ($okay)
-    {
-	$total_utime += $utime;
-	$total_stime += $stime;
-    }
-    else
-    {
-	@FAILED_TESTS = (@FAILED_TESTS, $test);
-    }
-
-    # If there were historical data, add the run time to the total time to 
-    # compare against the historical run time.
-    if (0 < ($hutime + $hstime))
-    {
-	$total_ntime += $utime + $stime;
-    }
-}
-foreach $test (@DTESTS)
-{
-    # Diff mode.
-    $okay = 1;
 
-    ($okay, $utime, $stime) = &run_test($test);
-
-    if (-e "./$test.out" && -e "$opt_srcdir/$test.exp")
-    {
-	`diff ./$test.out $opt_srcdir/$test.exp > ./$test.diff 2>&1`;
-	if ($?)
-	{
-	    # diff returns non-zero if there is a difference.
-	    $okay = 0;
-	}
-    }
-    else
-    {
-	$okay = 0;
-	if ($opt_verbose)
-	{
-	    print STDERR
-		"Nonexistent expected output file \"$opt_srcdir/$test.exp\"\n";
-            print STDERR "\$opt_srcdir is \"$opt_srcdir\"\n";
-	}
+	($hutime, $hstime) = &print_stats($test, $okay,
+					  $num_failed_subtests, $num_subtests,
+					  $utime, $stime);
     }
 
-    ($hutime, $hstime) = &print_stats($test, $okay, 0, 0, $utime, $stime);
     $total_hutime += $hutime;
     $total_hstime += $hstime;
 
@@ -311,10 +274,10 @@ foreach $test (@DTESTS)
 
 # Print summary stats.
 $tt_str = sprintf ("%d / %d passed (%5.2f%%%%)",
-		   ($#STESTS + $#DTESTS + 2) - ($#FAILED_TESTS + 1),
-		   $#STESTS + $#DTESTS + 2,
-		   (($#STESTS + $#DTESTS + 2) - ($#FAILED_TESTS + 1))
-		   / ($#STESTS + $#DTESTS + 2) * 100);
+		   ($#ARGV + 1) - ($#FAILED_TESTS + 1),
+		   $#ARGV + 1,
+		   (($#ARGV + 1) - ($#FAILED_TESTS + 1))
+		   / ($#ARGV + 1) * 100);
 
 $t_str = sprintf ("Totals                                   %7.2f  %7.2f %7.2f"
                   . "  %7.2f\n"
@@ -340,6 +303,11 @@ if (!$opt_quiet)
     }
 }
 
+if ($#FAILED_TESTS >= 0)
+{
+    # One or more tests failed, so return an error.
+    exit 1;
+}
 # End of main execution.
 
 sub run_test
@@ -348,8 +316,15 @@ sub run_test
     my ($okay) = 1;
     my ($tutime, $tstime);
     my ($utime, $stime, $cutime, $cstime);
-    my (@TSTATS);
+    my (@TSTATS, @TPATH);
     my ($t_str);
+    my ($srcdir, $objdir);
+
+    # Get the path component of $test, if any.
+    @TPATH = split(/\//, $test);
+    pop(@TPATH);
+    $srcdir = join('/', ($opt_srcdir, @TPATH));
+    $objdir = join('/', ($opt_objdir, @TPATH));
 
     @TSTATS = ("--------------------------------------------------------------------------\n");
 
@@ -365,7 +340,7 @@ sub run_test
     }
 
     ($utime, $stime, $cutime, $cstime) = times;
-    `./$test $opt_srcdir > ./$test.out 2>&1`;
+    `$opt_objdir/$test $srcdir $objdir > $opt_objdir/$test.out 2>&1`;
     ($utime, $stime, $tutime, $tstime) = times;
 
     # Subtract the before time from the after time.
@@ -379,7 +354,8 @@ sub run_test
 	    $okay = 0;
 	    if ($opt_verbose)
 	    {
-		print STDERR "\"./$test > ./$test.out 2>&1\" returned $?\n";
+		print STDERR
+		    "\"$opt_objdir/$test > $opt_objdir/$test.out 2>&1\" returned $?\n";
 	    }
 	}
     }
@@ -404,9 +380,9 @@ sub print_stats
     
     if (-r "$test.perf")
     {
-	if (!open (TEST_PERF, "<./$test.perf"))
+	if (!open (TEST_PERF, "<$opt_objdir/$test.perf"))
 	{
-	    print STDERR "Unable to open \"./$test.perf\"\n";
+	    print STDERR "Unable to open \"$opt_objdir/$test.perf\"\n";
 	    exit 1;
 	}
 	$_ = <TEST_PERF>;
@@ -445,11 +421,11 @@ sub print_stats
 
     if ($okay && $opt_ustats)
     {
-	if (!open (TEST_PERF, ">./$test.perf"))
+	if (!open (TEST_PERF, ">$opt_objdir/$test.perf"))
 	{
 	    if (!$opt_quiet)
 	    {
-		print STDERR "Unable to update \"$test.perf\"\n";
+		print STDERR "Unable to update \"$opt_objdir/$test.perf\"\n";
 	    }
 	}
 	else
@@ -466,7 +442,7 @@ sub usage
 {
     print <<EOF;
 $0 usage:
-    $0 [<options>] -- {[-s | -d | --sequence | --diff] <test>+}+
+    $0 [<options>] <test>+
 
     Option        | Description
     --------------+-------------------------------------------------------------
@@ -474,32 +450,25 @@ $0 usage:
     -v --verbose  | Verbose (incompatible with quiet).
     -q --quiet    | Quiet (incompatible with verbose).
     -s --srcdir   | Path to source tree (default is ".").
+    -o --objdir   | Path to object tree (default is ".").
     -u --ustats   | Update historical statistics (stored in "<test>.perf".
     -z --zero     | Consider non-zero exit code to be an error.
     --------------+-------------------------------------------------------------
 
-    Flag          | Description
-    --------------+-------------------------------------------------------------
-    -s --sequence | Sequence mode (default).
-                  | Output to stdout of the following form is expected:
-                  | 
-                  | -----------------
-                  | 1..<n>
-                  | {not} ok [1]
-                  | {not} ok [2]
-                  | ...
-                  | {not} ok [n]
-                  | -----------------
-                  | 
-                  | 1 <= <n> < 2^31
-                  | 
-                  | Lines which do not match the patterns shown above are
-                  | ignored, except that the 1..<n> construct must be the first
-                  | line of output seen.
-                  | 
-    -d --diff     | Diff mode (incompatible with sequence mode).
-                  | If <test>.exp exists, diff it with the output from <test> to
-                  | determine success or failure.
-    --------------+-------------------------------------------------------------
+    If <test>.exp exists, <test>'s output is diff'ed with <test>.exp.  Any
+    difference is considered failure.
+
+    If <test>.exp does not exist, output to stdout of the following form is
+    expected:
+
+        1..<n>
+        {not }ok[ 1]
+        {not }ok[ 2]
+        ...
+        {not }ok[ n]
+
+    1 <= <n> < 2^31
+
+    Lines which do not match the patterns shown above are ignored.
 EOF
 }