From: Damir Tomic Date: Fri, 12 Jun 2015 08:50:27 +0000 (+0200) Subject: generate_test_runner.rb: X-Git-Tag: NTP_4_3_40~6^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6427294e843543b181ac7cae81d18a9d5e85e1fe;p=thirdparty%2Fntp.git generate_test_runner.rb: test runners main() will always call init_lib() and init_auth() bk: 557a9d53GrmxgMwf6PkEcLXtbIttdQ --- diff --git a/sntp/unity/auto/generate_test_runner.rb b/sntp/unity/auto/generate_test_runner.rb index 4f1e709c8..0a02c70f1 100644 --- a/sntp/unity/auto/generate_test_runner.rb +++ b/sntp/unity/auto/generate_test_runner.rb @@ -250,7 +250,8 @@ class UnityTestRunnerGenerator #output.puts("\nu_long current_time = 4; // needed by authkeys. Used only in to calculate lifetime.\n"); output.puts(" progname = argv[0];\n") - + output.puts(" init_lib();\n") + output.puts(" init_auth();\n") output.puts(" suite_setup();") unless @options[:suite_setup].nil? output.puts(" Unity.TestFile = \"#{filename}\";") output.puts(" UnityBegin(\"#{filename}\");") diff --git a/tests/libntp/authkeys.c b/tests/libntp/authkeys.c index 1fbb8e3c1..c1cc85b37 100644 --- a/tests/libntp/authkeys.c +++ b/tests/libntp/authkeys.c @@ -17,7 +17,8 @@ u_long current_time = 4; // old code from google test framework, moved to SetUp() for unity void setUp(void) { - //init_lib(); +// init_lib(); +// init_auth(); //causes segfault /* * init_auth() is called by tests_main.cpp earlier. It @@ -34,6 +35,7 @@ void setUp(void) cache_flags = 0; cache_secret = NULL; cache_secretsize = 0; + } void tearDown(void)