From 23d0172c94809df84934426f3ac9f73ee45345b4 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Mon, 17 Apr 2017 23:56:24 +0200
Subject: [PATCH] integration tests must use 'villas-subcommand' instead' of
 'villas subcommand'

---
 tests/integration/pipe-file-advio.sh |  8 ++++----
 tests/integration/test-cmp.sh        | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/integration/pipe-file-advio.sh b/tests/integration/pipe-file-advio.sh
index ca50df59b..3144e3140 100755
--- a/tests/integration/pipe-file-advio.sh
+++ b/tests/integration/pipe-file-advio.sh
@@ -28,13 +28,13 @@ nodes = {
 }
 EOF
 
-villas signal sine -n -l 10 > ${INPUT_FILE}
+villas-signal sine -n -l 10 > ${INPUT_FILE}
 
-villas pipe -s ${CONFIG_FILE} remote_file_out < ${INPUT_FILE}
+villas-pipe -s ${CONFIG_FILE} remote_file_out < ${INPUT_FILE}
 
-villas pipe -r ${CONFIG_FILE} remote_file_in > ${OUTPUT_FILE}
+villas-pipe -r ${CONFIG_FILE} remote_file_in > ${OUTPUT_FILE}
 
-villas test-cmp -j ${INPUT_FILE} ${OUTPUT_FILE}
+villas-test-cmp -j ${INPUT_FILE} ${OUTPUT_FILE}
 RC=$?
 
 rm -f ${CONFIG_FILE} ${INPUT_FILE} ${OUTPUT_FILE}
diff --git a/tests/integration/test-cmp.sh b/tests/integration/test-cmp.sh
index 9fff9354a..335966ffb 100755
--- a/tests/integration/test-cmp.sh
+++ b/tests/integration/test-cmp.sh
@@ -20,28 +20,28 @@ cat > ${INPUT_FILE} <<EOF
 1491095597.545159701(9)	-0.587785
 EOF
 
-villas test-cmp ${INPUT_FILE} ${INPUT_FILE}
+villas-test-cmp ${INPUT_FILE} ${INPUT_FILE}
 (( $? == 0 )) || fail 1
 
-villas test-cmp ${INPUT_FILE} <(head -n5 ${INPUT_FILE}; sleep 1; tail -n5 ${INPUT_FILE})
+villas-test-cmp ${INPUT_FILE} <(head -n5 ${INPUT_FILE}; sleep 1; tail -n5 ${INPUT_FILE})
 (( $? == 0 )) || fail 8
 
-villas test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE})
+villas-test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE})
 (( $? == 1 )) || fail 2
 
-villas test-cmp ${INPUT_FILE} <(cat       ${INPUT_FILE}; echo "1491095597.545159701(9)	-0.587785")
+villas-test-cmp ${INPUT_FILE} <(cat       ${INPUT_FILE}; echo "1491095597.545159701(9)	-0.587785")
 (( $? == 1 )) || fail 7
 
-villas test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(55)	-0.587785")
+villas-test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(55)	-0.587785")
 (( $? == 2 )) || fail 3
 
-villas test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095598.545159701(9)	-0.587785")
+villas-test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095598.545159701(9)	-0.587785")
 (( $? == 3 )) || fail 4
 
-villas test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9)	-0.587785 -0.587785")
+villas-test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9)	-0.587785 -0.587785")
 (( $? == 4 )) || fail 5
 
-villas test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9)	-1.587785")
+villas-test-cmp ${INPUT_FILE} <(head -n-1 ${INPUT_FILE}; echo "1491095597.545159701(9)	-1.587785")
 (( $? == 5 )) || fail 6
 
 rm ${INPUT_FILE}
\ No newline at end of file