MXS-1300: Combine REST API and MaxCtrl tests

The REST API tests are now located under the maxctrl directory. This
allows both tests to use the same framework for testing.

CMakeLists.txt

@@ -186,6 +186,7 @@ add_subdirectory(plugins)
 add_subdirectory(query_classifier)
 add_subdirectory(server)
 add_subdirectory(include/maxscale)
+add_subdirectory(maxctrl)
 if(NOT WITHOUT_MAXADMIN)
   add_subdirectory(client)
 endif()

maxctrl/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(test)

maxctrl/test/test_rest_api.sh

@@ -16,7 +16,7 @@ testdir=$PWD/local_test/
 mkdir -p $testdir && cd $testdir
 
 # Currently all tests that use npm are for the REST API
-cp -t $testdir -r $srcdir/server/core/test/rest-api/*
+cp -t $testdir -r $srcdir/maxctrl/test/*
 npm install
 
 mkdir -p $maxscaledir && cd $maxscaledir

server/core/test/CMakeLists.txt

@@ -83,5 +83,3 @@ add_test(TestTrxCompare_Update test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../..
 add_test(TestTrxCompare_MaxScale test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/maxscale.test)
 add_test(TestJson testjson)
 add_test(TestHttp testhttp)
-
-add_subdirectory(rest-api)