New upstream version 1.4

4 files changed, 18 insertions, 14 deletions

diff --git a/tests/server/admin-t b/tests/server/admin-t
index f025d98..a74e6db 100755
--- a/tests/server/admin-t
+++ b/tests/server/admin-t
@@ -3,10 +3,11 @@
 # Tests for the wallet-admin dispatch code.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2008, 2009, 2010, 2011, 2014
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2008-2011, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 use strict;
 use Test::More tests => 42;
@@ -68,7 +69,7 @@ sub upgrade {
 # Wallet::Admin package has already been loaded.
 package main;
 $INC{'Wallet/Admin.pm'} = 'FAKE';
-eval { do "$ENV{SOURCE}/../server/wallet-admin" };
+do "$ENV{C_TAP_BUILD}/../server/wallet-admin";
 
 # Run the wallet admin client.  This fun hack takes advantage of the fact that
 # the wallet admin client is written in Perl so that we can substitute our own
diff --git a/tests/server/backend-t b/tests/server/backend-t
index 2ed8404..fb7d97b 100755
--- a/tests/server/backend-t
+++ b/tests/server/backend-t
@@ -3,10 +3,11 @@
 # Tests for the wallet-backend dispatch code.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2006-2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 use strict;
 use Test::More tests => 1311;
@@ -189,7 +190,7 @@ $INC{'Wallet/Server.pm'} = 'FAKE';
 my $OUTPUT;
 our $SYSLOG = \$OUTPUT;
 my $INPUT = '';
-eval { do "$ENV{SOURCE}/../server/wallet-backend" };
+do "$ENV{C_TAP_BUILD}/../server/wallet-backend";
 
 # Run the wallet backend.  This fun hack takes advantage of the fact that the
 # wallet backend is written in Perl so that we can substitute our own
diff --git a/tests/server/keytab-t b/tests/server/keytab-t
index 94c1bd8..7e7c3f0 100755
--- a/tests/server/keytab-t
+++ b/tests/server/keytab-t
@@ -3,10 +3,11 @@
 # Tests for the keytab-backend dispatch code.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2006, 2007, 2010
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2006-2007, 2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 use strict;
 use vars qw($CONFIG $KADMIN $SYSLOG $TMP);
@@ -16,9 +17,9 @@ use Test::More tests => 63;
 # Load the keytab-backend code and override various settings.
 my $OUTPUT;
 $SYSLOG = \$OUTPUT;
-eval { do "$ENV{SOURCE}/../server/keytab-backend" };
-$CONFIG = "$ENV{SOURCE}/data/allow-extract";
-$KADMIN = "$ENV{SOURCE}/data/fake-kadmin";
+do "$ENV{C_TAP_BUILD}/../server/keytab-backend";
+$CONFIG = "$ENV{C_TAP_SOURCE}/data/allow-extract";
+$KADMIN = "$ENV{C_TAP_SOURCE}/data/fake-kadmin";
 $TMP = '.';
 
 # Run the keytab backend.
diff --git a/tests/server/report-t b/tests/server/report-t
index ad05363..20382f0 100755
--- a/tests/server/report-t
+++ b/tests/server/report-t
@@ -3,10 +3,11 @@
 # Tests for the wallet-report dispatch code.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2008, 2009, 2010
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2008-2010
 #     The Board of Trustees of the Leland Stanford Junior University
 #
-# See LICENSE for licensing terms.
+# SPDX-License-Identifier: MIT
 
 use strict;
 use Test::More tests => 48;
@@ -72,7 +73,7 @@ sub owners {
 # Wallet::Report package has already been loaded.
 package main;
 $INC{'Wallet/Report.pm'} = 'FAKE';
-eval { do "$ENV{SOURCE}/../server/wallet-report" };
+eval { do "$ENV{C_TAP_SOURCE}/../server/wallet-report" };
 
 # Run the wallet report client.  This fun hack takes advantage of the fact
 # that the wallet report client is written in Perl so that we can substitute