From 33ba9e1bae07be51e5dd328e72e5527be4b158bb Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Fri, 16 Oct 2015 22:27:38 +0300
Subject: [PATCH] Added missing maxadmin tests.

---
 client/CMakeLists.txt          |  4 ++
 client/test/CMakeLists.txt     |  4 ++
 client/test/maxadmin_stress.sh |  0
 client/test/maxadmin_test.sh   | 82 ++++++++++++++--------------------
 4 files changed, 41 insertions(+), 49 deletions(-)
 create mode 100644 client/test/CMakeLists.txt
 mode change 100644 => 100755 client/test/maxadmin_stress.sh

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 32ab702ea..eb13ae659 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -8,3 +8,7 @@ else()
   message(STATUS "Could not find editline library. MaxAdmin will be built without it.")
 endif()
 install(TARGETS maxadmin DESTINATION ${MAXSCALE_BINDIR})
+
+if(BUILD_TESTS)
+  add_subdirectory(test)
+endif()
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
new file mode 100644
index 000000000..e59eaf7f0
--- /dev/null
+++ b/client/test/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(PROGRAMS maxadmin_test.sh DESTINATION ${CMAKE_BINARY_DIR})
+install(PROGRAMS maxadmin_stress.sh DESTINATION ${CMAKE_BINARY_DIR})
+add_test(TestMaxAdmin ${CMAKE_BINARY_DIR}/maxadmin_test.sh)
+add_test(TestMaxAdminStress ${CMAKE_BINARY_DIR}/maxadmin_stress.sh)
diff --git a/client/test/maxadmin_stress.sh b/client/test/maxadmin_stress.sh
old mode 100644
new mode 100755
diff --git a/client/test/maxadmin_test.sh b/client/test/maxadmin_test.sh
index c58c1512e..03976bc90 100755
--- a/client/test/maxadmin_test.sh
+++ b/client/test/maxadmin_test.sh
@@ -96,61 +96,45 @@ fi
 #
 # Test enable|disable log debug|trace|message|error
 #
-maxadmin -pmariadb enable log debug >& /dev/null
-if [ $? -eq "1" ]; then
-	echo "Enable debug log:			Failed"
-	failure=`expr $failure + 1`
-else
-	passed=`expr $passed + 1`
-	echo "Enable debug log:			Passed"
-fi
 
-maxadmin -pmariadb enable log trace >& /dev/null
-if [ $? -eq "1" ]; then
-	echo "Enable trace log:			Failed"
-	failure=`expr $failure + 1`
-else
-	passed=`expr $passed + 1`
-	echo "Enable trace log:			Passed"
-fi
+for action in enable disable
+do
+    maxadmin -pmariadb $action log debug >& /dev/null
+    if [ $? -eq "1" ]; then
+	    echo "$action debug log:			Failed"
+	    failure=`expr $failure + 1`
+    else
+	    passed=`expr $passed + 1`
+	    echo "$action debug log:			Passed"
+    fi
 
-maxadmin -pmariadb enable log message >& /dev/null
-if [ $? -eq "1" ]; then
-        echo "Enable message log:                 Failed"
+    maxadmin -pmariadb $action log trace >& /dev/null
+    if [ $? -eq "1" ]; then
+	    echo "$action trace log:			Failed"
+	    failure=`expr $failure + 1`
+    else
+	    passed=`expr $passed + 1`
+	    echo "$action trace log:			Passed"
+    fi
+
+    maxadmin -pmariadb $action log message >& /dev/null
+    if [ $? -eq "1" ]; then
+        echo "$action message log:                 Failed"
         failure=`expr $failure + 1`
-else
+    else
         passed=`expr $passed + 1`
-        echo "Enable message log:                 Passed"
-fi
+        echo "$action message log:                 Passed"
+    fi
 
-maxadmin -pmariadb enable log error >& /dev/null
-if [ $? -eq "1" ]; then
-        echo "Enable error log:                 Failed"
+    maxadmin -pmariadb $action log error >& /dev/null
+    if [ $? -eq "1" ]; then
+        echo "$action error log:                 Failed"
         failure=`expr $failure + 1`
-else
+    else
         passed=`expr $passed + 1`
-        echo "Enable error log:                 Passed"
-fi
-
-
-
-maxadmin -pmariadb disable log debug >& /dev/null
-if [ $? -eq "1" ]; then
-	echo "Disable debug log:			Failed"
-	failure=`expr $failure + 1`
-else
-	passed=`expr $passed + 1`
-	echo "Disable debug log:			Passed"
-fi
-
-maxadmin -pmariadb disable log trace >& /dev/null
-if [ $? -eq "1" ]; then
-	echo "Disable trace log:			Failed"
-	failure=`expr $failure + 1`
-else
-	passed=`expr $passed + 1`
-	echo "Disable trace log:			Passed"
-fi
+        echo "$action error log:                 Passed"
+    fi
+done
 
 #
 # Test restart monitor|service without, with invalid and with long invalid argument
@@ -186,7 +170,7 @@ do
 done
 
 #
-# Test set server qwerty master withaout, with invalid and with long invalid arg
+# Test set server qwerty master without, with invalid and with long invalid arg
 #
 maxadmin -pmariadb set server qwerty >& /dev/null
 if [ $? -eq "1" ]; then