summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
diff options
context:
space:
mode:
authorgordon <gordon@FreeBSD.org>2018-03-07 05:58:24 +0000
committergordon <gordon@FreeBSD.org>2018-03-07 05:58:24 +0000
commit5f0a95d4d67b9661a44d76f8be22183785af0814 (patch)
treed12a586453bbbc83e599e0e2311907acb6e2e467 /contrib/ntp/sntp/unity/auto/generate_test_runner.rb
parent722c1ce56e86ad17ed56adee959f19b00bc1ca93 (diff)
downloadFreeBSD-src-5f0a95d4d67b9661a44d76f8be22183785af0814.zip
FreeBSD-src-5f0a95d4d67b9661a44d76f8be22183785af0814.tar.gz
Fix multiple vulnerabilities in ntp. [SA-18:02.ntp]
Approved by: so Security: FreeBSD-SA-18:02.ntp Security: CVE-2018-7182 Security: CVE-2018-7170 Security: CVE-2018-7184 Security: CVE-2018-7185 Security: CVE-2018-7183
Diffstat (limited to 'contrib/ntp/sntp/unity/auto/generate_test_runner.rb')
-rw-r--r--contrib/ntp/sntp/unity/auto/generate_test_runner.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ntp/sntp/unity/auto/generate_test_runner.rb b/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
index 5b1d451..22d10db 100644
--- a/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
+++ b/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
@@ -246,7 +246,7 @@ class UnityTestRunnerGenerator
def create_suite_setup_and_teardown(output)
unless (@options[:suite_setup].nil?)
output.puts("\n//=======Suite Setup=====")
- output.puts("static int suite_setup(void)")
+ output.puts("static void suite_setup(void)")
output.puts("{")
output.puts(@options[:suite_setup])
output.puts("}")
@@ -323,13 +323,13 @@ class UnityTestRunnerGenerator
output.puts(" progname = argv[0];\n")
-
+ modname = filename.split(/[\/\\]/).last
output.puts(" suite_setup();") unless @options[:suite_setup].nil?
- output.puts(" UnityBegin(\"#{filename}\");")
+ output.puts(" UnityBegin(\"#{modname}\");")
if (@options[:use_param_tests])
tests.each do |test|
OpenPOWER on IntegriCloud