From ce25569eeae154664f54ae6f920f53a073a6ab64 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Fri, 1 Sep 2017 13:48:57 -0700 Subject: [PATCH] Use 0 instead of CHILD_ERROR_NATIVE since the latter only exists in Perl >= 5.14.2, and doesn't seem to have any obvious advantages. --- src/test-harness/twtools.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test-harness/twtools.pm b/src/test-harness/twtools.pm index e575e8e..1252162 100644 --- a/src/test-harness/twtools.pm +++ b/src/test-harness/twtools.pm @@ -221,7 +221,7 @@ sub PrintPolicy { my (@out) = `$twrootdir/bin/twadmin -m p -c $twrootdir/$twcfgloc -p $twrootdir/$twpolfileloc -S $twrootdir/$twsitekeyloc $params{opts} 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out); @@ -239,7 +239,7 @@ sub PrintConfig { logStatus "printing config file...\n"; my (@out) = `$twrootdir/bin/twadmin -m f -c $twrootdir/$twcfgloc $params{opts} 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out); @@ -275,7 +275,7 @@ sub GeneratePolicyFile { my (@out) = `$twrootdir/bin/twadmin -m P -c $twrootdir/$twcfgloc -Q $twsitepass -p $twrootdir/$twpolfileloc $twrootdir/$twpolicyloc 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out); @@ -297,7 +297,7 @@ sub CreatePolicy { my (@out) = `$twrootdir/bin/twadmin -m P -c $twrootdir/$twcfgloc -Q $twsitepass -p $twrootdir/$twpolfileloc $params{policy-text} 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out); @@ -315,7 +315,7 @@ sub InitializeDatabase { print "initializing database for '$twmsg' test...\n" if $verbose; my (@out) = `$twrootdir/bin/tripwire -m i -P $twsitepass -p $twrootdir/$twpolfileloc -c $twrootdir/$twcfgloc 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out); @@ -335,7 +335,7 @@ sub UpdateDatabase { print "updating database for '$twmsg' test...\n" if $verbose; my (@out) = `$twrootdir/bin/tripwire -m u -a -P $twsitepass -Z $params{secure-mode} -p $twrootdir/$twpolfileloc -c $twrootdir/$twcfgloc -r $params{report} 2>&1`; - my ($result) = ${^CHILD_ERROR_NATIVE}; + my ($result) = $?; logStatus(@out);