Moved vg_regtest to vg_regtest.in, using autoconf so vg_regtest now knows where

the `valgrind' script is kept, so people who install valgrind in a directory
other than the one I do don't need to use the --valgrind option all the time.

As a consequence, vg_regtests is now installed in and run out of bin/, rather
than tests/.

Also added a GPL copyright notice to vg_regtests.in.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1118

diff --git a/configure.in b/configure.in
index df851e45d01fa8ed1698da25e49276421ff0872d..97b68382481847b7c99a2b4cb359eaab09e17b68 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -295,6 +295,7 @@ AC_OUTPUT(
    valgrind.spec
    docs/Makefile 
    tests/Makefile 
+   tests/vg_regtest 
    tests/unused/Makefile 
    include/Makefile 
    coregrind/Makefile 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f92830ecff713a340ae4db147ff08e60bf6e1133..a243435877a664e60ab41527a551776c05992e9b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,14 @@
 
 SUBDIRS = . unused
 
+bin_SCRIPTS = \
+       vg_regtest
+
 noinst_SCRIPTS = \
        filter_addresses \
        filter_discards \
        filter_stderr_basic \
-       filter_test_paths \
-       vg_regtest
+       filter_test_paths
 
 EXTRA_DIST = \
        $(noinst_SCRIPTS) \

diff --git a/tests/vg_regtest b/tests/vg_regtest.in
similarity index 87%
rename from tests/vg_regtest
rename to tests/vg_regtest.in
index a45ce1a94f63168024f47f98d1589972cf3119f9..53ce9f1629a67d7c4906e6244869020b35e64f2f 100755 (executable)
--- a/tests/vg_regtest
+++ b/tests/vg_regtest.in
@@ -2,13 +2,38 @@
 ##--------------------------------------------------------------------##
 ##--- Valgrind regression testing script                vg_regtest ---##
 ##--------------------------------------------------------------------##
+
+#  This file is part of Valgrind, an x86 protected-mode emulator 
+#  designed for debugging and profiling binaries on x86-Unixes.
+#
+#  Copyright (C) 2002 Nicholas Nethercote
+#     njn25@cam.ac.uk
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+#  02111-1307, USA.
+#
+#  The GNU General Public License is contained in the file COPYING.
+
+#----------------------------------------------------------------------------
 # usage: vg_regtest [options] <dirs | files>
 #
 # Options:
 #   --stable:   use stable-branch stderr results (*.stderr.exp.hd)
 #   --dev:      use dev-branch stderr results    (*.stderr.exp - default)
 #   --all:      run tests in all subdirs
-#   --valgrind: valgrind to use.  Default is in ./inst/bin/valgrind
+#   --valgrind: valgrind to use.  Default is one built from this source tree.
 #
 # You can specify individual files to test, or whole directories, or both.
 # The stable-branch/dev-branch distinction allows slight differences in stderr
@@ -61,8 +86,10 @@ my @failures;           # List of failed tests
 
 my $exp = "";           # --dev is default
 
-# Assumes we're in valgrind/
-my $valgrind = "inst/bin/valgrind";
+# Default valgrind to use is this build tree's one
+my $prefix="@prefix@";
+my $exec_prefix="@exec_prefix@";
+my $valgrind = "@bindir@/valgrind";
 
 chomp(my $tests_dir = `pwd`);
 
@@ -324,4 +351,6 @@ foreach my $f (@fs) {
 }
 summarise_results();
 
-
+##--------------------------------------------------------------------##
+##--- end                                               vg_regtest ---##
+##--------------------------------------------------------------------##