run-ssl_init.c:

  new file
ssl_init.c:
  fix for minor #else warning
Makefile.am:
  modified /sntp/tests/Makefile.am so it is consistent to harlans /tests/libntp/Makefile.am changes, including the run-test-* -> run-*
  fixed the stuff I broke with automerge XD

bk: 55815753mhaxTRgXDvxYDzxRlrr16Q

diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am
index c9a7efe1ecdbb095b9b636a6d2301507b96ccd1f..331a045d13bd9a7976dcc4cf997c1991fbcb905d 100644 (file)
--- a/sntp/tests/Makefile.am
+++ b/sntp/tests/Makefile.am
@@ -101,6 +101,12 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 AM_LDFLAGS = $(LDFLAGS_NTP)
 
 
+BUILT_SOURCES +=                                       \
+       $(srcdir)/networking.c run-networking.c         \
+       $(srcdir)/kodDatabase.c run-kodDatabase.c       \
+       $(srcdir)/run-keyFile.c                         \
+       $(NULL)
+
 test_networking_CFLAGS =                       \
        -I$(top_srcdir)/unity                   \
        $(NULL)
@@ -113,8 +119,8 @@ test_kodDatabase_CFLAGS =           \
        -I$(top_srcdir)/unity           \
        $(NULL)
 
-test_kodDatabase_LDADD =                       \
-       $(unity_tests_LDADD)                    \
+test_kodDatabase_LDADD =               \
+       $(unity_tests_LDADD)            \
        $(NULL)
 
 test_keyFile_CFLAGS =                  \
@@ -125,39 +131,34 @@ test_keyFile_LDADD =                      \
        $(unity_tests_LDADD)            \
        $(NULL)
 
-BUILT_SOURCES +=                                       \
-       $(srcdir)/networking.c run-test-networking.c    \
-       $(srcdir)/kodDatabase.c run-test-kodDatabase.c  \
-       $(srcdir)/run-test-keyFile.c                    \
-       $(NULL)
 
 test_networking_SOURCES =              \
        networking.c                    \
-       run-test-networking.c           \
+       run-networking.c                \
        $(NULL)
 
 test_kodDatabase_SOURCES =             \
        kodDatabase.c                   \
-       run-test-kodDatabase.c          \
+       run-kodDatabase.c               \
        ../version.c                    \
        $(NULL)
 
 test_keyFile_SOURCES =                 \
        keyFile.c                       \
-       run-test-keyFile.c              \
+       run-keyFile.c           \
        $(NULL)
 
-$(srcdir)/run-test-networking.c: $(srcdir)/networking.c $(std_unity_list)
-       $(run_unity) networking.c run-test-networking.c
+$(srcdir)/run-networking.c: $(srcdir)/networking.c $(std_unity_list)
+       $(run_unity) networking.c run-networking.c
 
-$(srcdir)/run-test-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
-       $(run_unity) kodDatabase.c run-test-kodDatabase.c
+$(srcdir)/run-kodDatabase.c: $(srcdir)/kodDatabase.c $(std_unity_list)
+       $(run_unity) kodDatabase.c run-kodDatabase.c
 
 #$(srcdir)/../version.c: $(srcdir)/../version.c
 #      gcc -o version.o ../version.c
 
-$(srcdir)/run-test-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
-       $(run_unity) keyFile.c run-test-keyFile.c
+$(srcdir)/run-keyFile.c: $(srcdir)/keyFile.c $(std_unity_list)
+       $(run_unity) keyFile.c run-keyFile.c
 
 TESTS = 
 

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 97cedb8daab73e29923d87da3d04ca182c992f36..fe69230c9e9f18d24b831ab7b9ea3c74785cc1f2 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -24,6 +24,7 @@ check_PROGRAMS =              \
        test-numtohost          \
        test-octtoint           \
        test-refnumtoa          \
+       test-ssl_init           \
        test-socktoa            \
        test-statestr           \
        test-timespecops        \
@@ -31,7 +32,6 @@ check_PROGRAMS =              \
        test-uglydate           \
        test-vi64ops            \
        test-ymd2yd             \
-       test-ssl_init           \
        $(NULL)
 
 if GTEST_AVAILABLE
@@ -99,7 +99,7 @@ tests_SOURCES =                                       \
        g_refnumtoa.cpp         \
        sfptostr.cpp            \
        socktoa.cpp             \
-       ssl_init.cpp            \
+       g_ssl_init.cpp          \
        g_statestr.cpp          \
        strtolfp.cpp            \
        g_timespecops.cpp       \
@@ -130,14 +130,15 @@ BUILT_SOURCES +=                  \
        $(srcdir)/run-numtohost.c       \
        $(srcdir)/run-octtoint.c        \
        $(srcdir)/run-refnumtoa.c       \
+       $(srcdir)/run-ssl_init.c        \
        $(srcdir)/run-socktoa.c         \
        $(srcdir)/run-statestr.c        \
+       $(srcdir)/run-timevalops.c      \
+       $(srcdir)/run-timespecops.c     \
        $(srcdir)/run-uglydate.c        \
        $(srcdir)/run-vi64ops.c         \
        $(srcdir)/run-ymd2yd.c          \
        $(srcdir)/run-calendar.c        \
-       $(srcdir)/run-timevalops.c      \
-       $(srcdir)/run-timespecops.c     \
        $(NULL)
 
 noinst_HEADERS =       \
@@ -376,8 +377,8 @@ test_timespecops_LDADD =                    \
        $(top_builddir)/sntp/unity/libunity.a   \
        $(NULL)
 
-test_ssl_init_CFLAGS =                 \
-       -I$(top_srcdir)/sntp/unity      \
+test_ssl_init_CFLAGS =                         \
+       -I$(top_srcdir)/sntp/unity              \
        $(NULL)
 
 test_ssl_init_LDADD =                          \
@@ -513,9 +514,14 @@ test_timevalops_SOURCES =          \
 test_timespecops_SOURCES =             \
        timespecops.c                   \
        run-timespecops.c               \
-       $(srcdir)/run-test-ssl_init.c           \
        $(NULL)
 
+test_ssl_init_SOURCES =                        \
+       ssl_init.c                      \
+       run-ssl_init.c                  \
+       $(NULL)
+
+
 $(srcdir)/run-modetoa.c: $(srcdir)/modetoa.c $(std_unity_list)
        $(run_unity) modetoa.c run-modetoa.c
 
@@ -591,8 +597,8 @@ $(srcdir)/run-timevalops.c: $(srcdir)/timevalops.c $(std_unity_list)
 $(srcdir)/run-timespecops.c: $(srcdir)/timespecops.c $(std_unity_list)
        $(run_unity) timespecops.c run-timespecops.c
 
-$(srcdir)/run-test-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
-       $(run_unity) ssl_init.c run-test-ssl_init.c
+$(srcdir)/run-ssl_init.c: $(srcdir)/ssl_init.c $(std_unity_list)
+       $(run_unity) ssl_init.c run-ssl_init.c
 
 TESTS =
 

diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
new file mode 100644 (file)
index 0000000..8e87dc9
--- /dev/null
+++ b/tests/libntp/run-ssl_init.c
@@ -0,0 +1,57 @@
+/* AUTOGENERATED FILE. DO NOT EDIT. */
+
+//=======Test Runner Used To Run Each Test Below=====
+#define RUN_TEST(TestFunc, TestLineNum) \
+{ \
+  Unity.CurrentTestName = #TestFunc; \
+  Unity.CurrentTestLineNumber = TestLineNum; \
+  Unity.NumberOfTests++; \
+  if (TEST_PROTECT()) \
+  { \
+      setUp(); \
+      TestFunc(); \
+  } \
+  if (TEST_PROTECT() && !TEST_IS_IGNORED) \
+  { \
+    tearDown(); \
+  } \
+  UnityConcludeTest(); \
+}
+
+//=======Automagically Detected Files To Include=====
+#include "unity.h"
+#include <setjmp.h>
+#include <stdio.h>
+
+//=======External Functions This Runner Calls=====
+extern void setUp(void);
+extern void tearDown(void);
+extern void test_MD5KeyTypeWithoutDigestLength();
+extern void test_MD5KeyTypeWithDigestLength();
+extern void test_SHA1KeyTypeWithDigestLength();
+extern void test_MD5KeyName();
+
+
+//=======Test Reset Option=====
+void resetTest()
+{
+  tearDown();
+  setUp();
+}
+
+char *progname;
+
+
+//=======MAIN=====
+int main(int argc, char *argv[])
+{
+  progname = argv[0];
+  Unity.TestFile = "ssl_init.c";
+  UnityBegin("ssl_init.c");
+  RUN_TEST(test_MD5KeyTypeWithoutDigestLength, 18);
+  RUN_TEST(test_MD5KeyTypeWithDigestLength, 22);
+  RUN_TEST(test_SHA1KeyTypeWithDigestLength, 31);
+  RUN_TEST(test_MD5KeyName, 46);
+
+  return (UnityEnd());
+}

diff --git a/tests/libntp/ssl_init.c b/tests/libntp/ssl_init.c
index 93b7afd6a224fe8261d6c9a6d3c5fff40d8db7d3..fb8a90959ea184dee41b3e3e86de9bf81d15d027 100644 (file)
--- a/tests/libntp/ssl_init.c
+++ b/tests/libntp/ssl_init.c
@@ -36,7 +36,8 @@ void test_SHA1KeyTypeWithDigestLength() {
        TEST_ASSERT_EQUAL(NID_sha, keytype_from_text("SHA", &digestLength));
        TEST_ASSERT_EQUAL(expected, digestLength);
        /* OPENSSL */
-#else TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined");
+#else 
+       TEST_IGNORE_MESSAGE("Skipping because OPENSSL isn't defined");
 #endif
 }