summaryrefslogtreecommitdiff
path: root/tests/service
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2009-03-26 09:11:19 +0100
committerAndreas Baumann <abaumann@yahoo.com>2009-03-26 09:11:19 +0100
commitd7c45cbce04098605236ca6b74454105f83d5799 (patch)
tree3cb5aab02bf5227fb7b9390c83c5683b3c897daf /tests/service
parent755ba7b56f245b1a09acaefd8283ba91ad55c68f (diff)
downloadwolfbones-d7c45cbce04098605236ca6b74454105f83d5799.tar.gz
wolfbones-d7c45cbce04098605236ca6b74454105f83d5799.tar.bz2
small fixes around testing of service
Diffstat (limited to 'tests/service')
-rw-r--r--tests/service/Makefile.W328
-rwxr-xr-xtests/service/create_testservicemsg.pl2
-rw-r--r--tests/service/testservice.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/service/Makefile.W32 b/tests/service/Makefile.W32
index a841462..c25bd6b 100644
--- a/tests/service/Makefile.W32
+++ b/tests/service/Makefile.W32
@@ -21,7 +21,7 @@ TEST_BINS = \
!INCLUDE $(TOPDIR)\makefiles\nmake\sub.mk
-test_service.exe: test_service.obj $(TOPDIR)\src\wolf.lib
+testservice.exe: testservice.obj $(TOPDIR)\src\wolf.lib
testservicemsg.dll: testservicemsg.res
$(LINK) /dll /nologo /noentry /MACHINE:x86 /out:$@ $?
@@ -33,9 +33,9 @@ local_test: $(LIBRARIES)
@echo Testing service..
@copy testservicemsg.dll C:\TEMP >NUL
@testservice /install 2>NUL
- @net start testservice >NUL
- @net stop testservice >NUL
- @testservice /remove 2>NUL
+ @net start testservice >>NUL
+ @net stop testservice >>NUL
+ @testservice /remove 2>>NUL
local_all:
diff --git a/tests/service/create_testservicemsg.pl b/tests/service/create_testservicemsg.pl
index 6fea267..ab0bf3c 100755
--- a/tests/service/create_testservicemsg.pl
+++ b/tests/service/create_testservicemsg.pl
@@ -64,7 +64,7 @@ Logger
MessageId = 0x2
SymbolicName = WOLF_CATEGORY_DAEMON
Language = English
-Dameon
+Daemon
.
;Language = German
;Unix-Prozess
diff --git a/tests/service/testservice.c b/tests/service/testservice.c
index 70da431..eb91587 100644
--- a/tests/service/testservice.c
+++ b/tests/service/testservice.c
@@ -294,7 +294,7 @@ void WINAPI wolf_service_main( DWORD argc, LPTSTR *argv ) {
}
wolf_service_report_status( SERVICE_RUNNING, NO_ERROR, 0 );
- wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_DAEMON, WOLF_MSG_TESTSERVICE_STARTED_SERVICE,
+ wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TESTSERVICE, WOLF_MSG_TESTSERVICE_STARTED_SERVICE,
_( "Started %s service" ), SERVICE_NAME );
/* main loop */
@@ -322,7 +322,7 @@ void WINAPI wolf_service_main( DWORD argc, LPTSTR *argv ) {
}
SERVICE_END:
- wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_DAEMON, WOLF_MSG_TESTSERVICE_STOPPED_SERVICE,
+ wolf_log( WOLF_LOG_NOTICE, WOLF_CATEGORY_TESTSERVICE, WOLF_MSG_TESTSERVICE_STOPPED_SERVICE,
_( "Stopped %s service" ), SERVICE_NAME );
wolf_log_closelogtoeventlog( );