mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

php: Fix the tests yet again.

Browse Source 
Move unsetting of LIBGUESTFS_DEBUG & LIBGUESTFS_TRACE into the
php-for-tests.sh wrapper.

Fixes commit 0d69eab98f.
This commit is contained in:
Pino Toscano
2016-04-24 15:05:02 +01:00
committed by Richard W.M. Jones
parent 915f6e299e
commit 1f5054daa8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
php/extension/php-for-tests.sh.in
View File

@@ -1,4 +1,16 @@
#!/bin/sh
. ./env
# Setting debug or trace isn't very useful because the PHP test script
# mixes stdout and stderr together and compares this to the expected
# output, so you'd just get failures for every test. So there is no
# good way to debug libguestfs failures in PHP tests, but if an
# individual test fails locally then you can edit the
# guestfs_php_*.phpt.in and uncomment the putenv statement, then look
# at the output.
unset LIBGUESTFS_DEBUG
unset LIBGUESTFS_TRACE
@PHP@ $@

12
php/run-php-tests.sh
View File

@@ -24,18 +24,6 @@ cd extension
# therefore have to load the environment (from php/extension/env which
# is generated below) at the start of each test script.
# As a consequence of above, LIBGUESTFS_DEBUG=1 and LIBGUESTFS_TRACE=1
# won't get passed down to the script. Furthermore, setting debug or
# trace isn't very useful anyway because the PHP test script mixes
# stdout and stderr together and compares this to the expected output,
# so you'd just get failures for every test. So there is no good way
# to debug libguestfs failures in PHP tests, but if an individual test
# fails locally then you can edit the guestfs_php_*.phpt.in and
# uncomment the putenv statement, then look at the output.
unset LIBGUESTFS_DEBUG
unset LIBGUESTFS_TRACE
# This makes a file containing the environment variables we want to set.
rm -f env
echo "PATH=$PATH" > env