move common-test.pl to common directory; new popen/gzip test for dvipsk

git-svn-id: svn://tug.org/texlive/trunk@17085 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 14 insertions, 35 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ffbb8c43628..92d2e36ba34 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-18  Karl Berry  <karl@tug.org>
+
+	* tests/common-test.pl: moved to texk/tests.
+	* tests/write18-quote-test.pl,
+	* tests/bibtex-openout-test.pl: change calls.
+
 2010-02-01  Karl Berry  <karl@tug.org>
 
 	* doc/web2c.texi (Output file location): mention that TEXMFOUTPUT
diff --git a/Build/source/texk/web2c/tests/bibtex-openout-test.pl b/Build/source/texk/web2c/tests/bibtex-openout-test.pl
index fc8dabfc846..45fd92d1b6f 100755
--- a/Build/source/texk/web2c/tests/bibtex-openout-test.pl
+++ b/Build/source/texk/web2c/tests/bibtex-openout-test.pl
@@ -1,11 +1,10 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2009, 2010 Karl Berry <tex-live@tug.org>.
-# You may freely use, modify and/or distribute this file.
+# Public domain.  Originally written 2010, Karl Berry.
 # Check that bibtex respects openout_any.
 
-BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `pwd`); }
-require "$srcdir/tests/common-test.pl";
+BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `dirname $0`); }
+require "$srcdir/../tests/common-test.pl";
 
 exit (&main ());
 
diff --git a/Build/source/texk/web2c/tests/common-test.pl b/Build/source/texk/web2c/tests/common-test.pl
deleted file mode 100644
index 725ba55b624..00000000000
--- a/Build/source/texk/web2c/tests/common-test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id$
-# Copyright 2010 Karl Berry <tex-live@tug.org>.
-# You may freely use, modify and/or distribute this file.
-# Common definitions for Perl tests in TeX Live.
-
-$ENV{"TEXMFCNF"} = "$srcdir/../kpathsea";
-$ENV{"BIBINPUTS"} = "$srcdir/tests";
-$ENV{"BSTINPUTS"} = "$srcdir/tests";
-$ENV{"TEXINPUTS"} = "$srcdir/tests";
-
-# Run PROG with ARGS.  Return the exit status.
-# Die if PROG is not executable.
-#
-sub test_run
-{
-  my ($prog, @args) = @_;
-
-  # Possibly we should check that $prog starts with ./, since we always
-  # want to run out of the build dir.  I think.
-  die "$0: no program $prog in " . `pwd` if ! -x $prog;
-  
-  my $ret = system ($prog, @args);  
-  return $ret;
-}
diff --git a/Build/source/texk/web2c/tests/write18-quote-test.pl b/Build/source/texk/web2c/tests/write18-quote-test.pl
index 74256516b73..d0daabdd054 100755
--- a/Build/source/texk/web2c/tests/write18-quote-test.pl
+++ b/Build/source/texk/web2c/tests/write18-quote-test.pl
@@ -1,11 +1,10 @@
 #!/usr/bin/env perl
 # $Id$
-# Copyright 2010 Karl Berry <tex-live@tug.org>.
-# You may freely use, modify and/or distribute this file.
+# Public domain.  Originally written 2010, Karl Berry.
 # Check that restricted shell invocation doesn't misquote.
 
-BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `pwd`); }
-require "$srcdir/tests/common-test.pl";
+BEGIN { chomp ($srcdir = $ENV{"srcdir"} || `dirname $0`); }
+require "$srcdir/../tests/common-test.pl";
 
 exit (&main ());
 
@@ -14,7 +13,7 @@ sub main
   $badfile = "write18-quote-newfile.tex";
   unlink ($badfile);  # ensure no leftover from previous test
   
-  my @args = qw(-ini -shell-restricted $srcdir/tests/write18-quote.tex);
+  my @args = (qw(-ini -shell-restricted), "$srcdir/tests/write18-quote.tex");
   my $ret = &test_run ("./tex", @args);
 
   my $bad = -f $badfile;  # file should not have been created
diff --git a/Build/source/texk/web2c/tests/write18-quote.tex b/Build/source/texk/web2c/tests/write18-quote.tex
index d766ac4f808..dcfe6cb1e92 100644
--- a/Build/source/texk/web2c/tests/write18-quote.tex
+++ b/Build/source/texk/web2c/tests/write18-quote.tex
@@ -1,6 +1,5 @@
 % $Id$
-% Copyright 2010 Karl Berry <tex-live@tug.org>.
-% You may freely use, modify and/or distribute this file.
+% Public domain.  Originally written 2010, Karl Berry.
 
 \catcode`\{=1 \catcode`\}=2  % allow for running with initex.