From c6b94f62668373855dce85e6489c18d118a0285c Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 14 Oct 2020 10:17:49 +0100
Subject: [PATCH] Fix running of basic client tests.

---
 test/client/Makefile | 10 ++++++++++
 test/client/test.sh  | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 test/client/Makefile

diff --git a/test/client/Makefile b/test/client/Makefile
new file mode 100644
index 00000000..25e07d09
--- /dev/null
+++ b/test/client/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all check test ptest clean
+
+all :
+
+check : test
+ptest : test
+test :
+	./test.sh
+
+clean:
diff --git a/test/client/test.sh b/test/client/test.sh
index a5229455..53ee84b9 100755
--- a/test/client/test.sh
+++ b/test/client/test.sh
@@ -5,12 +5,13 @@
 
 set -e
 
-export LD_LIBRARY_PATH=../lib
+export BASE_PATH=../../
+export LD_LIBRARY_PATH=${BASE_PATH}/lib
 export PORT=1888
 export SUB_TIMEOUT=1
 
 # Start broker
-../src/mosquitto -p ${PORT} 2>/dev/null &
+../../src/mosquitto -p ${PORT} 2>/dev/null &
 export MOSQ_PID=$!
 sleep 0.5
 
@@ -19,28 +20,28 @@ trap "kill $MOSQ_PID" EXIT
 
 
 # Simple subscribe test - single message from $SYS
-./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t '$SYS/broker/uptime' >/dev/null
+${BASE_PATH}/client/mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t '$SYS/broker/uptime' >/dev/null
 echo "Simple subscribe ok"
 
 # Simple publish/subscribe test - single message from mosquitto_pub
-./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t 'single/test' >/dev/null &
+${BASE_PATH}/client/mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C 1 -t 'single/test' >/dev/null &
 export SUB_PID=$!
-./mosquitto_pub -p ${PORT} -t 'single/test' -m 'single-test'
+${BASE_PATH}/client/mosquitto_pub -p ${PORT} -t 'single/test' -m 'single-test'
 kill ${SUB_PID} 2>/dev/null || true
 echo "Simple publish/subscribe ok"
 
 # Publish a file and subscribe, do we get at least that many lines?
 export TEST_LINES=$(wc -l test.sh | cut -d' ' -f1)
-./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
+${BASE_PATH}/client/mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
 export SUB_PID=$!
-./mosquitto_pub -p ${PORT} -t 'file-publish' -f ./test.sh
+${BASE_PATH}/client/mosquitto_pub -p ${PORT} -t 'file-publish' -f ./test.sh
 kill ${SUB_PID} 2>/dev/null || true
 echo "File publish ok"
 
 # Publish a file from stdin and subscribe, do we get at least that many lines?
 export TEST_LINES=$(wc -l test.sh | cut -d' ' -f1)
-./mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
+${BASE_PATH}/client/mosquitto_sub -p ${PORT} -W ${SUB_TIMEOUT} -C ${TEST_LINES} -t 'file-publish' >/dev/null &
 export SUB_PID=$!
-./mosquitto_pub -p ${PORT} -t 'file-publish' -l < ./test.sh
+${BASE_PATH}/client/mosquitto_pub -p ${PORT} -t 'file-publish' -l < ./test.sh
 kill ${SUB_PID} 2>/dev/null || true
 echo "stdin publish ok"