Improved test order, added checklinks test messages

2 files changed, 5 insertions, 3 deletions

diff --git a/test/checklinks b/test/checklinks
index 00b3da3..ce5c133 100644
--- a/test/checklinks
+++ b/test/checklinks
@@ -14,11 +14,13 @@ echo barbl > bar
 echo flurbl > file
 echo morp > flurbl
 
+echo "# checklinks"
 checklinks
 [[ $(cat foo) == $(cat bar) ]]
 [[ $(cat link) == $(cat file) ]]
 [[ $(cat blub) == $(cat flurbl) ]]
 
+echo "# checklinks --remove"
 checklinks --remove
 [[ -e bar ]]
 [[ ! -e link ]]
diff --git a/test/main b/test/main
index 75b3cd8..93bc7dd 100755
--- a/test/main
+++ b/test/main
@@ -25,12 +25,12 @@ test directories:
 	HOME = $test_home
 meow
 
-source $tests/setup
-
-echo "# bootstrapping PKG_DIR"
 cd $test_home
 export HOME=$test_home
 source $tests/checklinks
+(source $tests/setup)
+
+echo "# bootstrapping PKG_DIR"
 $test_proot/core/include/bootstrap $test_proot $test_pdir
 
 echo "# checking for success"