hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests not having environment variables set.

Browse Source
This commit is contained in:
Markus Makela
2015-01-08 13:18:14 +02:00
parent c4006d43c2
commit 094dfbd4f7
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/test/CMakeLists.txt
View File

@ -25,8 +25,8 @@ target_link_libraries(test_service fullcore)
target_link_libraries(test_server fullcore) target_link_libraries(test_server fullcore)
target_link_libraries(test_users fullcore) target_link_libraries(test_users fullcore)
target_link_libraries(test_adminusers fullcore) target_link_libraries(test_adminusers fullcore)
add_test(testMySQLUsers test_mysql_users)
target_link_libraries(testmemlog fullcore) target_link_libraries(testmemlog fullcore)
add_test(testMySQLUsers test_mysql_users)
add_test(TestHash test_hash) add_test(TestHash test_hash)
add_test(TestHint test_hint) add_test(TestHint test_hint)
add_test(TestSpinlock test_spinlock) add_test(TestSpinlock test_spinlock)
@ -35,8 +35,22 @@ add_test(TestBuffer test_buffer)
add_test(TestDCB test_dcb) add_test(TestDCB test_dcb)
add_test(TestModutil test_modutil) add_test(TestModutil test_modutil)
add_test(TestPoll test_poll) add_test(TestPoll test_poll)
add_test(TestService /bin/sh -c " MAXSCALE_HOME=${CMAKE_BINARY_DIR} && ${CMAKE_CURRENT_BINAR_DIR}/test_service") add_test(TestService test_service)
add_test(TestServer test_server) add_test(TestServer test_server)
add_test(TestUsers test_users) add_test(TestUsers test_users)
add_test(TestAdminUsers test_adminusers) add_test(TestAdminUsers test_adminusers)
add_test(TestMemlog testmemlog) add_test(TestMemlog testmemlog)
set_tests_properties(testMySQLUsers
TestHash
TestHint
TestSpinlock
TestFilter
TestBuffer
TestDCB
TestModutil
TestPoll
TestService
TestServer
TestUsers
TestAdminUsers
TestMemlog PROPERTIES ENVIRONMENT MAXSCALE_HOME=${CMAKE_BINARY_DIR}/)

4
server/core/test/testservice.c
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <maxscale_test.h> #include <maxscale_test.h>
#include <service.h> #include <service.h>
#include <poll.h>
/** /**
* test1 Allocate a service and do lots of other things * test1 Allocate a service and do lots of other things
* *
@ -52,7 +52,7 @@ char* argv[] = {
NULL NULL
}; };
skygw_logmanager_init(argc,argv); skygw_logmanager_init(argc,argv);
poll_init();
/* Service tests */ /* Service tests */
ss_dfprintf(stderr, ss_dfprintf(stderr,
"testservice : creating service called MyService with router nonexistent"); "testservice : creating service called MyService with router nonexistent");