From 68c4b05c268cd6e358cc41c8feb44bc2c7fcb898 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 3 Jun 2018 16:47:33 -0700 Subject: Fix loading of server programs in tests The eval was hiding all error messages when the test didn't work properly, and C_TAP_SOURCE doesn't have the generated version with the proper path to Perl. --- tests/server/admin-t | 2 +- tests/server/backend-t | 2 +- tests/server/keytab-t | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/server/admin-t b/tests/server/admin-t index 4d6670b..a74e6db 100755 --- a/tests/server/admin-t +++ b/tests/server/admin-t @@ -69,7 +69,7 @@ sub upgrade { # Wallet::Admin package has already been loaded. package main; $INC{'Wallet/Admin.pm'} = 'FAKE'; -eval { do "$ENV{C_TAP_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 de59458..fb7d97b 100755 --- a/tests/server/backend-t +++ b/tests/server/backend-t @@ -190,7 +190,7 @@ $INC{'Wallet/Server.pm'} = 'FAKE'; my $OUTPUT; our $SYSLOG = \$OUTPUT; my $INPUT = ''; -eval { do "$ENV{C_TAP_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 5cf6788..7e7c3f0 100755 --- a/tests/server/keytab-t +++ b/tests/server/keytab-t @@ -17,7 +17,7 @@ use Test::More tests => 63; # Load the keytab-backend code and override various settings. my $OUTPUT; $SYSLOG = \$OUTPUT; -eval { do "$ENV{C_TAP_SOURCE}/../server/keytab-backend" }; +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 = '.'; -- cgit v1.2.3