Some test enhancements

diff --git a/share/trashman/docker/unix/linux/debian/test b/share/trashman/docker/unix/linux/debian/test
index 684453c9ac3efacfb70c42d0361a7b18931ed3b6..69611baf4d3adff1e3c23685cffa383d1d1d3d77 100755 (executable)
--- a/share/trashman/docker/unix/linux/debian/test
+++ b/share/trashman/docker/unix/linux/debian/test
@@ -9,7 +9,7 @@ SHARE="$1"
 # Include basic functions
 . $SHARE/trashman/functions || exit 1
 
-# Basic check
+# Basic test
 if ! which docker > /dev/null 2>&1; then
   exit 1
 fi

diff --git a/share/trashman/nodejs/unix/linux/debian/test b/share/trashman/nodejs/unix/linux/debian/test
index f465bb64726b8a4ed7def25fbdf204c20df3f12f..6af295bcaadc388185e87a6107362a157d774f79 100755 (executable)
--- a/share/trashman/nodejs/unix/linux/debian/test
+++ b/share/trashman/nodejs/unix/linux/debian/test
@@ -9,9 +9,14 @@ SHARE="$1"
 # Include basic functions
 . $SHARE/trashman/functions || exit 1
 
+# Basic test
+if ! which nodejs > /dev/null 2>&1; then
+  exit 1
+fi
+
 # Run hello-world test program
-__trashman_echo "Check if nodejs runs..."
-nodejs -v > /dev/null 2>&1
+__trashman_echo_keepline "Testing program version... "
+nodejs -v
 status="$?"
 
 # Test exit status

diff --git a/share/trashman/trashman/functions b/share/trashman/trashman/functions
index 4208b456e337058147eb0256c8f06357e792df11..133552806eb854a653840f83a988bd6ba38fc666 100644 (file)
--- a/share/trashman/trashman/functions
+++ b/share/trashman/trashman/functions
@@ -13,6 +13,12 @@ __trashman_echo() {
   echo "-> $*"
 }
 
+# Message, no newline
+__trashman_echo_keepline() {
+  #echo ""
+  echo -n "-> $*"
+}
+
 # Our most common ancestor
 __trashman_ancestor() {
   echo "unix"