Publish

10 files changed, 59 insertions, 0 deletions

diff --git a/configd/src/tests/configd/.gitignore b/configd/src/tests/configd/.gitignore
new file mode 100644
index 00000000000..cd635735b8c
--- /dev/null
+++ b/configd/src/tests/configd/.gitignore
@@ -0,0 +1,4 @@
+.depend*
+Makefile
+configd_test
+/tmp.log
diff --git a/configd/src/tests/configd/CMakeLists.txt b/configd/src/tests/configd/CMakeLists.txt
new file mode 100644
index 00000000000..59f87a30390
--- /dev/null
+++ b/configd/src/tests/configd/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+add_test(NAME configd_configd_test COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/run-sentinel.sh)
diff --git a/configd/src/tests/configd/DESC b/configd/src/tests/configd/DESC
new file mode 100644
index 00000000000..b46cf2c5ba3
--- /dev/null
+++ b/configd/src/tests/configd/DESC
@@ -0,0 +1 @@
+Unit tests for the config daemon (aka sentinel)
diff --git a/configd/src/tests/configd/FILES b/configd/src/tests/configd/FILES
new file mode 100644
index 00000000000..63c2a3e08ca
--- /dev/null
+++ b/configd/src/tests/configd/FILES
@@ -0,0 +1 @@
+run-sentinel.sh
diff --git a/configd/src/tests/configd/run-sentinel.sh b/configd/src/tests/configd/run-sentinel.sh
new file mode 100755
index 00000000000..97ba32d34e8
--- /dev/null
+++ b/configd/src/tests/configd/run-sentinel.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+if ../../apps/sentinel/config-sentinel > tmp.log 2>&1 ; then
+	echo "Should need argument"
+	exit 1
+fi
+if grep -q Usage tmp.log ; then
+	: ok
+else
+	echo "Missing usage in log:"
+	cat tmp.log
+	exit 1
+fi
+
+exit 0
diff --git a/configd/src/tests/messages/.gitignore b/configd/src/tests/messages/.gitignore
new file mode 100644
index 00000000000..7e625100dc2
--- /dev/null
+++ b/configd/src/tests/messages/.gitignore
@@ -0,0 +1,4 @@
+.depend*
+Makefile
+messages_test
+configd_messages_test_app
diff --git a/configd/src/tests/messages/CMakeLists.txt b/configd/src/tests/messages/CMakeLists.txt
new file mode 100644
index 00000000000..fed4f9fe470
--- /dev/null
+++ b/configd/src/tests/messages/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(configd_messages_test_app
+    SOURCES
+    messages.cpp
+    DEPENDS
+    vespalog
+    vespalib
+)
+vespa_add_test(NAME configd_messages_test_app COMMAND configd_messages_test_app)
diff --git a/configd/src/tests/messages/DESC b/configd/src/tests/messages/DESC
new file mode 100644
index 00000000000..089612b9cae
--- /dev/null
+++ b/configd/src/tests/messages/DESC
@@ -0,0 +1 @@
+Unit tests for the configserver protocol.
diff --git a/configd/src/tests/messages/FILES b/configd/src/tests/messages/FILES
new file mode 100644
index 00000000000..139bb6fb364
--- /dev/null
+++ b/configd/src/tests/messages/FILES
@@ -0,0 +1 @@
+messages.cpp
diff --git a/configd/src/tests/messages/messages.cpp b/configd/src/tests/messages/messages.cpp
new file mode 100644
index 00000000000..b2627f66453
--- /dev/null
+++ b/configd/src/tests/messages/messages.cpp
@@ -0,0 +1,20 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+#include <vespa/log/log.h>
+#include <vespa/vespalib/testkit/testapp.h>
+
+LOG_SETUP("messages_test");
+
+class MessagesTest : public vespalib::TestApp
+{
+public:
+    MessagesTest() { }
+    int Main();
+};
+
+int MessagesTest::Main()
+{
+    TEST_INIT("messages_test");
+    TEST_DONE();
+}
+
+TEST_APPHOOK(MessagesTest);