From 56b72efde0e82dac534ca312bad17b5f2fa2d8e5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 10 Aug 2013 09:59:57 -0700 Subject: [PATCH] Fix testlib --- test/lib | 1 + test/test | 1 - test/testlib | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/lib b/test/lib index ba8733a..b2cea2e 100644 --- a/test/lib +++ b/test/lib @@ -97,4 +97,5 @@ test_eq () { # Setup the testing environment . "$(readlink -f $(dirname $(readlink -f $HOME/.xinitrc))/../)/lib/loader" +[ -z "$RUNNING_SHELL" ] && RUNNING_SHELL="$(shell)" test_clear diff --git a/test/test b/test/test index 3c89e67..1fc9f05 100755 --- a/test/test +++ b/test/test @@ -1,5 +1,4 @@ #!/usr/bin/env sh . "$(readlink -f $(dirname $(readlink -f $HOME/.xinitrc))/../)/test/lib" -[ -z "$RUNNING_SHELL" ] && RUNNING_SHELL="$(shell)" load_all test/tests test_run_all diff --git a/test/testlib b/test/testlib index 482205d..85b8dc5 100755 --- a/test/testlib +++ b/test/testlib @@ -18,6 +18,7 @@ success_test () { return 0 } fail_test () { + echo "This is the error" return 1 } test_run success_test @@ -25,6 +26,6 @@ test_run fail_test echo "" # Register tests -test_register fail_test test_register success_test +test_register fail_test test_run_all