tests: move libsigsegv disable to configure.ac

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

6 files changed, 16 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index ee2534c..0044a76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,12 @@ AC_PROG_LIBTOOL
 
 AC_PREFIX_DEFAULT([/usr])
 
+dnl this test fills up the stack and then triggers a segfault ...
+dnl but it's hard to wrap things without a stack, so let's ignore
+dnl this test for now ...
+ac_cv_header_sigsegv_h=no
+ac_cv_lib_sigsegv_stackoverflow_install_handler=false
+
 dnl Checks for libraries.
 dnl Checks for header files.
 AC_FUNC_ALLOCA
diff --git a/src/sandbox.sh b/src/sandbox.sh
index 7e63bc8..3a9680c 100755
--- a/src/sandbox.sh
+++ b/src/sandbox.sh
@@ -2,4 +2,8 @@
 # quick wrapper to run local sandbox with local libsandbox
 dir=${0%/*}
 export LD_LIBRARY_PATH=${dir}/../libsandbox/.libs
-exec "${dir}"/sandbox "$@"
+if [ -x "${dir}"/sandbox ] ; then
+	exec "${dir}"/sandbox "$@"
+else
+	exec sandbox "$@"
+fi
diff --git a/tests/atlocal b/tests/atlocal
deleted file mode 100644
index 1731900..0000000
--- a/tests/atlocal
+++ /dev/null
@@ -1,2 +0,0 @@
-export PATH=$abs_top_builddir/src:$abs_builddir:$PATH
-export LD_LIBRARY_PATH=$abs_top_builddir/libsandbox/.libs${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 1731900..b1f27d6 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,2 +1 @@
-export PATH=$abs_top_builddir/src:$abs_builddir:$PATH
-export LD_LIBRARY_PATH=$abs_top_builddir/libsandbox/.libs${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+export PATH=$abs_top_srcdir/src:$abs_top_builddir/src:$abs_builddir:$PATH
diff --git a/tests/libsigsegv.at b/tests/libsigsegv.at
index 745b1df..7ff03bb 100644
--- a/tests/libsigsegv.at
+++ b/tests/libsigsegv.at
@@ -1,12 +1,7 @@
 AT_SETUP(libsigsegv)
 
-ulimit -Ss 300
-AT_SB_CHECK([libsigsegv_tst], [1], [ignore], [ignore])
-dnl this test fills up the stack and then triggers a segfault ...
-dnl but it's hard to wrap things without a stack, so let's ignore
-dnl this test for now ...
-dnl AT_SB_CHECK([libsigsegv_tst], [0], [dnl
-dnl starting overflow ... caught segv ... OVERFLOW: OK!
-dnl ])
+AT_SB_CHECK([libsigsegv_tst], [0], [dnl
+starting overflow ... caught segv ... OVERFLOW: OK!
+])
 
 AT_CLEANUP
diff --git a/tests/libsigsegv_tst.c b/tests/libsigsegv_tst.c
index 35ad246..c7d816e 100644
--- a/tests/libsigsegv_tst.c
+++ b/tests/libsigsegv_tst.c
@@ -9,7 +9,7 @@
 
 #include "tests.h"
 
-#define WRITE(msg) write(1, msg, sizeof(msg))
+#define WRITE(msg) write(1, msg, sizeof(msg) - 1)
 
 #ifdef HAVE_SIGSEGV_H
 #include <sigsegv.h>