tests: Fold test-basic.sh into test-run.sh

It was never that useful, just a quick stub to get Travis going, which we don't
use right now.  Let's just move it into the `test-run.sh`.

Closes: #163
Approved by: alexlarsson

Makefile.am

@@ -29,7 +29,7 @@ test_bwrap_SOURCES=
 
 include Makefile-docs.am
 
-TESTS = tests/test-basic.sh tests/test-run.sh
+TESTS = tests/test-run.sh
 TESTS_ENVIRONMENT = BWRAP=$(abs_top_builddir)/test-bwrap
 
 EXTRA_DIST += $(TESTS)

tests/test-run.sh

@@ -17,6 +17,8 @@ function cleanup () {
 trap cleanup EXIT
 cd ${tempdir}
 
+: "${BWRAP:=bwrap}"
+
 skip () {
     echo $@ 1>&2; exit 77
 }
@@ -47,12 +49,16 @@ if test -x `dirname $UNREADABLE`; then
 fi
 
 # Default arg, bind whole host fs to /, tmpfs on /tmp
-RUN="${BWRAP:-bwrap} --bind / / --tmpfs /tmp"
+RUN="${BWRAP} --bind / / --tmpfs /tmp"
 
 if ! $RUN true; then
     skip Seems like bwrap is not working at all. Maybe setuid is not working
 fi
 
+# Test help
+${BWRAP} --help > help.txt
+assert_file_has_content help.txt "usage: bwrap"
+
 for ALT in "" "--unshare-user-try"  "--unshare-pid" "--unshare-user-try --unshare-pid"; do
     # Test fuse fs as bind source
     if [ x$FUSE_DIR != x ]; then