From 29ec86d0809bcfcc26abbc39edfb414cbdae4c25 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 23 Aug 2018 19:57:50 +0200
Subject: [PATCH] build: Fixes for make check.

* build-aux/config.sh (srcdir): Initialize if unset.
* build-aux/test.sh (DIFF): Do not fail if unset.
---
 build-aux/config.sh | 1 +
 build-aux/test.sh   | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build-aux/config.sh b/build-aux/config.sh
index db27c07c..55b37966 100644
--- a/build-aux/config.sh
+++ b/build-aux/config.sh
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
 
+srcdir=${srcdir-.}
 if [ "$V" = 2 ]; then
     echo $0
     echo srcdest=${srcdest}
diff --git a/build-aux/test.sh b/build-aux/test.sh
index 7eb88d15..eca48854 100755
--- a/build-aux/test.sh
+++ b/build-aux/test.sh
@@ -25,15 +25,12 @@ set -e
 MES_ARENA=100000000
 
 GUILE=${GUILE-$MES}
-DIFF=${DIFF-$(command -v diff)}
+DIFF=${DIFF-$(command -v diff)} || true
 [ -z "$DIFF" ] && DIFF="sh scripts/diff.scm"
 
 t=${1-scaffold/tests/t}
 o="$t"
 rm -f "$o".mes-out
-shift
-
-set -e
 
 rm -f "$o".gcc-out
 if [ -n "$CC" ]; then