From 9dbf03c115dc388ba76570a89ba00824ae2f326c Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 8 Apr 2019 21:45:08 +0200
Subject: [PATCH] Run the WASI checks using wasmtime

---
 configure.ac                      | 1 +
 dist-build/wasi.sh                | 5 +++--
 test/default/Makefile.am          | 4 ++++
 test/default/wasi-test-wrapper.sh | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 test/default/wasi-test-wrapper.sh

diff --git a/configure.ac b/configure.ac
index 8fb5317b..8e8a9de1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -809,6 +809,7 @@ AS_IF([test "x$EMSCRIPTEN" != "x"],[
 ])
 AC_SUBST(TEST_LDFLAGS)
 AM_CONDITIONAL([EMSCRIPTEN], [test "x$EMSCRIPTEN" != "x"])
+AM_CONDITIONAL([WASI], [test "x$WASI" != "x"])
 
 AC_DEFINE([CONFIGURED], [1], [the build system was properly configured])
 
diff --git a/dist-build/wasi.sh b/dist-build/wasi.sh
index 1282e918..4e8c82a4 100755
--- a/dist-build/wasi.sh
+++ b/dist-build/wasi.sh
@@ -21,7 +21,7 @@ export STRIP="llvm-strip"
 make distclean > /dev/null
 
 grep -q -F -- '-wasi' build-aux/config.sub || \
-  sed -i -e 's/-nacl\*)/-nacl*|-wasi/' build-aux/config.sub
+  sed -i -e 's/-nacl\*)/-nacl*|-wasi)/' build-aux/config.sub
 
 if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
   export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
@@ -36,6 +36,7 @@ fi
 NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
 PROCESSORS=${NPROCESSORS:-3}
 
-make -j${PROCESSORS} install || exit 1
+make -j${PROCESSORS} check || exit 1
+make install || exit 1
 
 make distclean > /dev/null
diff --git a/test/default/Makefile.am b/test/default/Makefile.am
index 9ccefe70..9351a1b7 100644
--- a/test/default/Makefile.am
+++ b/test/default/Makefile.am
@@ -497,6 +497,10 @@ TESTS_TARGETS += \
 	xchacha20
 endif
 
+if WASI
+LOG_COMPILER = ./wasi-test-wrapper.sh
+endif
+
 verify: check
 
 @VALGRIND_CHECK_RULES@
diff --git a/test/default/wasi-test-wrapper.sh b/test/default/wasi-test-wrapper.sh
new file mode 100755
index 00000000..76238fdd
--- /dev/null
+++ b/test/default/wasi-test-wrapper.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+wasmtime --dir=. "$1"
+