From: John Darrington Date: Sun, 20 Mar 2016 19:41:14 +0000 (+0100) Subject: Provide an environment where cross-compiled tests can run in an emulator X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48deb6eb1f122a0708ec97daac5774d5fa7e12c7;p=pspp Provide an environment where cross-compiled tests can run in an emulator This change allows some of the tests to run successfully under wine when cross-compiled with mingw --- diff --git a/tests/atlocal.in b/tests/atlocal.in index 29886a0cd2..b9b6239a55 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -36,8 +36,32 @@ export CHARSETALIASDIR GZIP= export GZIP +WINEPREFIX=$HOME/.wine # Work around the following kludge to keep wine happy +export WINEPREFIX + + HOME=/nonexistent # Kluge to make PSPP ignore $HOME/.pspprc. export HOME +PSPP=$abs_top_builddir/src/ui/terminal/pspp$EXEEXT +export PSPP + +PSPPCONVERT=$abs_top_builddir/utilities/pspp-convert$EXEEXT +export PSPPCONVERT + + # Avoids error messages during tests if $TERM is set to an unknown terminal. TERM=; unset TERM + +if test X"$RUNNER" != X; then + pspp () { + $RUNNER $PSPP "$@" + } +fi + +pspp_diff=`which diff` +if test X"$RUNNER" = Xwine; then + diff () { + $pspp_diff -w "$@" + } +fi