From caa85d68009e2d76b9078bdccd15bc817aeb38e8 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 24 Jan 2020 09:45:06 +0000
Subject: [PATCH] TST: fix make test_misc
---
makefile | 5 ++++-
misc/bend_symlinks/README.md | 2 +-
misc/bend_symlinks/test/test_suite.sh | 7 ++++---
3 files changed, 9 insertions(+), 5 deletions(-)
mode change 100644 => 100755 misc/bend_symlinks/test/test_suite.sh
diff --git a/makefile b/makefile
index ea03f993..49c65fbf 100644
--- a/makefile
+++ b/makefile
@@ -56,7 +56,10 @@ test: easy-units
mvn test -X
test_misc:
- cd misc/bend_symlinks/ && /bin/bash -c /usr/bin/shunit2 test/test_suite.sh
+ cd misc/bend_symlinks/ && ./bend_symlinks.sh -h && test/test_suite.sh | tee test_output
+ cat misc/bend_symlinks/test_output | grep "Ran 10 tests."
+ cat misc/bend_symlinks/test_output | grep "OK"
+ rm misc/bend_symlinks/test_output
clean: clean-antlr
mvn clean
diff --git a/misc/bend_symlinks/README.md b/misc/bend_symlinks/README.md
index f72357f8..a1fa833e 100644
--- a/misc/bend_symlinks/README.md
+++ b/misc/bend_symlinks/README.md
@@ -103,4 +103,4 @@
Run test suite with
- $ shunit2 test/test_suite.sh
+ $ ./test/test_suite.sh
diff --git a/misc/bend_symlinks/test/test_suite.sh b/misc/bend_symlinks/test/test_suite.sh
old mode 100644
new mode 100755
index 781e477e..9ffa6b1f
--- a/misc/bend_symlinks/test/test_suite.sh
+++ b/misc/bend_symlinks/test/test_suite.sh
@@ -1,8 +1,9 @@
+#!/bin/bash
-
-source "./src/utils.sh"
+source ./src/utils.sh
set +o errexit
+
BEND=./bend_symlinks.sh
FILE_SYSTEM_ROOT=test_dir/links
DATA_DIR=test_dir/original
@@ -226,4 +227,4 @@ testSymlinkToSymlink () {
}
-
+source shunit2
--
GitLab