Merge now requires program name

7 years ago · 29dc7a3e9e
parent 2038a2ecb9
commit 29dc7a3e9e
1 changed files with 1 additions and 1 deletions
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@ -285,7 +285,7 @@ function setUp () {
 # This test has to be done everytime in order for osync executable to be fresh
 function test_Merge () {
 	cd "$DEV_DIR"
-	./merge.sh
+	./merge.sh osync
 	assertEquals "Merging code" "0" $?

 	cd "$OSYNC_DIR"