[Git][NTPsec/ntpsec][master] 2 commits: Remove tests-runner and tests_main.cpp as they are no longer used.

[Amar Takhar]

Amar Takhar pushed to branch master at NTPsec / ntpsec


Commits:
358bd168 by Amar Takhar at 2015-11-20T16:53:02Z
Remove tests-runner and tests_main.cpp as they are no longer used.

- - - - -
97f22cd3 by Amar Takhar at 2015-11-20T17:01:04Z
Move fileHandlingTest.c to common/file_handling.c

- - - - -


7 changed files:

- tests/ntpdig/fileHandlingTest.c → tests/common/file_handling.c
- tests/ntpdig/fileHandlingTest.h → tests/common/file_handling.h
- tests/ntpdig/keyFile.c
- tests/ntpdig/kodFile.c
- − tests/ntpdig/tests-runner
- − tests/ntpdig/tests_main.cpp
- tests/wscript


Changes:

=====================================
tests/ntpdig/fileHandlingTest.c → tests/common/file_handling.c
=====================================
--- a/tests/ntpdig/fileHandlingTest.c
+++ b/tests/common/file_handling.c
@@ -1,7 +1,6 @@
-
 #include <stdio.h>
-
-#include "fileHandlingTest.h"
+#include "tests_main.h"
+#include "file_handling.h"
 
 const char* CreatePath(const char* filename, DirectoryType argument) {
 	const char* argpath = tests_main_args(argument);


=====================================
tests/ntpdig/fileHandlingTest.h → tests/common/file_handling.h
=====================================
--- a/tests/ntpdig/fileHandlingTest.h
+++ b/tests/common/file_handling.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FILE_HANDLING_TEST_H
 #define GUARD_FILE_HANDLING_TEST_H
 
-#include "ntpdigtest.h"
+//#include "ntpdigtest.h"
 
 typedef enum {
 	INPUT_DIR = 0,


=====================================
tests/ntpdig/keyFile.c
=====================================
--- a/tests/ntpdig/keyFile.c
+++ b/tests/ntpdig/keyFile.c
@@ -1,7 +1,10 @@
+#include "config.h"
+
 #include "unity.h"
 #include "unity_fixture.h"
 
-#include "fileHandlingTest.h"
+#include "ntp_stdlib.h"
+#include <file_handling.h>
 
 #include "crypto.h"
 


=====================================
tests/ntpdig/kodFile.c
=====================================
--- a/tests/ntpdig/kodFile.c
+++ b/tests/ntpdig/kodFile.c
@@ -1,8 +1,11 @@
+#include "config.h"
+
 #include "unity.h"
 #include "unity_fixture.h"
 
-#include "fileHandlingTest.h"
+#include <file_handling.h>
 
+#include "ntp_stdlib.h"
 #include "kod_management.h"
 
 /*


=====================================
tests/ntpdig/tests-runner deleted
=====================================
--- a/tests/ntpdig/tests-runner
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# $builddir is always .
-builddir=.
-# $srcdir will be set to the correct directory when this script is called from
-# the Makefiles generated by Automake.
-
-# Create output directory.
-mkdir -p $builddir/data
-
-# Test executable expects two arguments: test_input_dir and test_output_dir.
-./tests $srcdir/data $builddir/data


=====================================
tests/ntpdig/tests_main.cpp deleted
=====================================
--- a/tests/ntpdig/tests_main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "tests_main.h"
-
-const char *progname = "ntpdigtest";
-
-static void RunAllTests(void) {
-	RUN_TEST_GROUP(crypto);
-	RUN_TEST_GROUP(keyFile);
-}
-
-int main(int argc, const char * argv[]) {
-
-	init_lib();
-	init_auth();
-
-	return UnityMain(argc, argv, RunAllTests);
-}


=====================================
tests/wscript
=====================================
--- a/tests/wscript
+++ b/tests/wscript
@@ -17,13 +17,13 @@ def build(ctx):
 
 	# Test main.
 	common_source = [
-		"common/tests_main.c"
+		"common/tests_main.c",
 	]
 
 
 	ntpdig_source = [
 		"ntpdig/crypto.c",
-		"ntpdig/fileHandlingTest.c",
+		"common/file_handling.c",
 		"ntpdig/keyFile.c",
 		"ntpdig/kodDatabase.c",
 		"ntpdig/kodFile.c",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/83cb3da6e017dcc82b2bc756be713481ea9f0e8f...97f22cd30ba5c36c6ce74f9f801ac5c0efce9bcf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20151120/5b7eba69/attachment.html>