From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 21 Sep 2015 08:09:33 +0000 (+0000)
Subject: Fix progname definition in unity runner scripts.  Harlan Stenn.
X-Git-Tag: NTP_4_3_72~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3f72e0e59004cc21bd142743c3d14b48d182ed9;p=thirdparty%2Fntp.git

Fix progname definition in unity runner scripts.  Harlan Stenn.

bk: 55ffbb3dYiPrInv5cwiBs3x-Gy093Q
---

diff --git a/ChangeLog b/ChangeLog
index e76d7c88d..e870c0ee6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,7 @@ fixed formatting. Tomasz Flendrich
 * Unit test dist cleanup. Harlan Stenn.
 * Cleanup various test Makefile.am files.  Harlan Stenn.
 * Pthread autoconf macro cleanup.  Harlan Stenn.
+* Fix progname definition in unity runner scripts.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c
index eba43a31e..bf3a63eb1 100644
--- a/sntp/tests/run-packetProcessing.c
+++ b/sntp/tests/run-packetProcessing.c
@@ -58,7 +58,7 @@ void resetTest(void)
   setUp();
 }
 
-const char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c
index 146ee197f..dc9fa043b 100644
--- a/sntp/tests/run-t-log.c
+++ b/sntp/tests/run-t-log.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/sntp/unity/auto/generate_test_runner.rb b/sntp/unity/auto/generate_test_runner.rb
index 90096c2fb..5b1d45190 100644
--- a/sntp/unity/auto/generate_test_runner.rb
+++ b/sntp/unity/auto/generate_test_runner.rb
@@ -315,7 +315,7 @@ class UnityTestRunnerGenerator
 
 
   def create_main(output, filename, tests, used_mocks)
-    output.puts("\nchar *progname;\n")
+    output.puts("\nchar const *progname;\n")
     output.puts("\n\n//=======MAIN=====")
 
     output.puts("int main(int argc, char *argv[])")
diff --git a/tests/libntp/run-a_md5encrypt.c b/tests/libntp/run-a_md5encrypt.c
index ef7c47a97..122ed931c 100644
--- a/tests/libntp/run-a_md5encrypt.c
+++ b/tests/libntp/run-a_md5encrypt.c
@@ -44,7 +44,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-atoint.c b/tests/libntp/run-atoint.c
index 0bfb42743..e8405fd7d 100644
--- a/tests/libntp/run-atoint.c
+++ b/tests/libntp/run-atoint.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-atouint.c b/tests/libntp/run-atouint.c
index 8bad12772..b7c17320a 100644
--- a/tests/libntp/run-atouint.c
+++ b/tests/libntp/run-atouint.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-authkeys.c b/tests/libntp/run-authkeys.c
index 96ff37773..6a2b67081 100644
--- a/tests/libntp/run-authkeys.c
+++ b/tests/libntp/run-authkeys.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-buftvtots.c b/tests/libntp/run-buftvtots.c
index b0b06f0ac..82a19698e 100644
--- a/tests/libntp/run-buftvtots.c
+++ b/tests/libntp/run-buftvtots.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-calendar.c b/tests/libntp/run-calendar.c
index 743eed4d5..7f8bc4b53 100644
--- a/tests/libntp/run-calendar.c
+++ b/tests/libntp/run-calendar.c
@@ -51,7 +51,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-caljulian.c b/tests/libntp/run-caljulian.c
index c1e530ed1..a11389cbd 100644
--- a/tests/libntp/run-caljulian.c
+++ b/tests/libntp/run-caljulian.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-caltontp.c b/tests/libntp/run-caltontp.c
index 29ce755a9..c80e0a4a7 100644
--- a/tests/libntp/run-caltontp.c
+++ b/tests/libntp/run-caltontp.c
@@ -42,7 +42,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-calyearstart.c b/tests/libntp/run-calyearstart.c
index 448f13ffd..374e9d5eb 100644
--- a/tests/libntp/run-calyearstart.c
+++ b/tests/libntp/run-calyearstart.c
@@ -43,7 +43,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-clocktime.c b/tests/libntp/run-clocktime.c
index 9960ed882..8d19831f6 100644
--- a/tests/libntp/run-clocktime.c
+++ b/tests/libntp/run-clocktime.c
@@ -48,7 +48,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-decodenetnum.c b/tests/libntp/run-decodenetnum.c
index d30b60262..014151e98 100644
--- a/tests/libntp/run-decodenetnum.c
+++ b/tests/libntp/run-decodenetnum.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-hextoint.c b/tests/libntp/run-hextoint.c
index f21b85be4..66cc57dcd 100644
--- a/tests/libntp/run-hextoint.c
+++ b/tests/libntp/run-hextoint.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-hextolfp.c b/tests/libntp/run-hextolfp.c
index c6f6535ef..e894c3bbe 100644
--- a/tests/libntp/run-hextolfp.c
+++ b/tests/libntp/run-hextolfp.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-humandate.c b/tests/libntp/run-humandate.c
index de52ed2e5..1f2e717c6 100644
--- a/tests/libntp/run-humandate.c
+++ b/tests/libntp/run-humandate.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-lfpfunc.c b/tests/libntp/run-lfpfunc.c
index 771f11e00..ac6700f78 100644
--- a/tests/libntp/run-lfpfunc.c
+++ b/tests/libntp/run-lfpfunc.c
@@ -50,7 +50,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-lfptostr.c b/tests/libntp/run-lfptostr.c
index c744fba09..bae0f85b1 100644
--- a/tests/libntp/run-lfptostr.c
+++ b/tests/libntp/run-lfptostr.c
@@ -50,7 +50,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
@@ -58,17 +58,17 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("lfptostr.c");
-  RUN_TEST(test_PositiveInteger, 24);
-  RUN_TEST(test_NegativeInteger, 25);
-  RUN_TEST(test_PositiveIntegerWithFraction, 26);
-  RUN_TEST(test_NegativeIntegerWithFraction, 27);
-  RUN_TEST(test_RoundingDownToInteger, 28);
-  RUN_TEST(test_RoundingMiddleToInteger, 29);
-  RUN_TEST(test_RoundingUpToInteger, 30);
-  RUN_TEST(test_SingleDecimal, 31);
-  RUN_TEST(test_MillisecondsRoundingUp, 32);
-  RUN_TEST(test_MillisecondsRoundingDown, 33);
-  RUN_TEST(test_UnsignedInteger, 34);
+  RUN_TEST(test_PositiveInteger, 23);
+  RUN_TEST(test_NegativeInteger, 24);
+  RUN_TEST(test_PositiveIntegerWithFraction, 25);
+  RUN_TEST(test_NegativeIntegerWithFraction, 26);
+  RUN_TEST(test_RoundingDownToInteger, 27);
+  RUN_TEST(test_RoundingMiddleToInteger, 28);
+  RUN_TEST(test_RoundingUpToInteger, 29);
+  RUN_TEST(test_SingleDecimal, 30);
+  RUN_TEST(test_MillisecondsRoundingUp, 31);
+  RUN_TEST(test_MillisecondsRoundingDown, 32);
+  RUN_TEST(test_UnsignedInteger, 33);
 
   return (UnityEnd());
 }
diff --git a/tests/libntp/run-modetoa.c b/tests/libntp/run-modetoa.c
index c9025c58a..20e2d9516 100644
--- a/tests/libntp/run-modetoa.c
+++ b/tests/libntp/run-modetoa.c
@@ -40,7 +40,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-msyslog.c b/tests/libntp/run-msyslog.c
index d53d6b278..544fbc119 100644
--- a/tests/libntp/run-msyslog.c
+++ b/tests/libntp/run-msyslog.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-netof.c b/tests/libntp/run-netof.c
index 47fafdd5c..7a714f54e 100644
--- a/tests/libntp/run-netof.c
+++ b/tests/libntp/run-netof.c
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include "config.h"
 #include "ntp_stdlib.h"
+#include "ntp_calendar.h"
 #include "sockaddrtest.h"
 
 //=======External Functions This Runner Calls=====
@@ -43,7 +44,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-numtoa.c b/tests/libntp/run-numtoa.c
index fe6f45776..640e61c14 100644
--- a/tests/libntp/run-numtoa.c
+++ b/tests/libntp/run-numtoa.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-numtohost.c b/tests/libntp/run-numtohost.c
index 7c2a509d6..5ebe15b8f 100644
--- a/tests/libntp/run-numtohost.c
+++ b/tests/libntp/run-numtohost.c
@@ -40,7 +40,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-octtoint.c b/tests/libntp/run-octtoint.c
index 09ebbbaa8..9d2990401 100644
--- a/tests/libntp/run-octtoint.c
+++ b/tests/libntp/run-octtoint.c
@@ -45,7 +45,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-prettydate.c b/tests/libntp/run-prettydate.c
index 5ecc89208..e6c5ff3f6 100644
--- a/tests/libntp/run-prettydate.c
+++ b/tests/libntp/run-prettydate.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-recvbuff.c b/tests/libntp/run-recvbuff.c
index 85945a9e9..b8a379663 100644
--- a/tests/libntp/run-recvbuff.c
+++ b/tests/libntp/run-recvbuff.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-refidsmear.c b/tests/libntp/run-refidsmear.c
index 030136541..465690f76 100644
--- a/tests/libntp/run-refidsmear.c
+++ b/tests/libntp/run-refidsmear.c
@@ -42,7 +42,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-refnumtoa.c b/tests/libntp/run-refnumtoa.c
index f6ee54210..bb9fb605b 100644
--- a/tests/libntp/run-refnumtoa.c
+++ b/tests/libntp/run-refnumtoa.c
@@ -41,7 +41,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-sfptostr.c b/tests/libntp/run-sfptostr.c
index f1facc864..1ebe43ca7 100644
--- a/tests/libntp/run-sfptostr.c
+++ b/tests/libntp/run-sfptostr.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-socktoa.c b/tests/libntp/run-socktoa.c
index 664bb91b8..a5066e3f7 100644
--- a/tests/libntp/run-socktoa.c
+++ b/tests/libntp/run-socktoa.c
@@ -46,7 +46,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-ssl_init.c b/tests/libntp/run-ssl_init.c
index d1b80de9e..cef9a36fb 100644
--- a/tests/libntp/run-ssl_init.c
+++ b/tests/libntp/run-ssl_init.c
@@ -43,7 +43,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-statestr.c b/tests/libntp/run-statestr.c
index f839adfb2..9cfe0bc9f 100644
--- a/tests/libntp/run-statestr.c
+++ b/tests/libntp/run-statestr.c
@@ -44,7 +44,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-strtolfp.c b/tests/libntp/run-strtolfp.c
index c9e8e8321..74723192c 100644
--- a/tests/libntp/run-strtolfp.c
+++ b/tests/libntp/run-strtolfp.c
@@ -47,7 +47,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-timespecops.c b/tests/libntp/run-timespecops.c
index 548247af9..6c26521f0 100644
--- a/tests/libntp/run-timespecops.c
+++ b/tests/libntp/run-timespecops.c
@@ -70,7 +70,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-timevalops.c b/tests/libntp/run-timevalops.c
index 04a65614a..4a9351c70 100644
--- a/tests/libntp/run-timevalops.c
+++ b/tests/libntp/run-timevalops.c
@@ -69,7 +69,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-tstotv.c b/tests/libntp/run-tstotv.c
index 224f12aa5..c060f7712 100644
--- a/tests/libntp/run-tstotv.c
+++ b/tests/libntp/run-tstotv.c
@@ -42,7 +42,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-tvtots.c b/tests/libntp/run-tvtots.c
index e610bb5a5..3ed734eca 100644
--- a/tests/libntp/run-tvtots.c
+++ b/tests/libntp/run-tvtots.c
@@ -43,7 +43,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-uglydate.c b/tests/libntp/run-uglydate.c
index a6d63f52f..6ec50f660 100644
--- a/tests/libntp/run-uglydate.c
+++ b/tests/libntp/run-uglydate.c
@@ -40,7 +40,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-vi64ops.c b/tests/libntp/run-vi64ops.c
index 45caaece3..599a4b78d 100644
--- a/tests/libntp/run-vi64ops.c
+++ b/tests/libntp/run-vi64ops.c
@@ -42,7 +42,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/libntp/run-ymd2yd.c b/tests/libntp/run-ymd2yd.c
index 4202c65d8..4669ce9b5 100644
--- a/tests/libntp/run-ymd2yd.c
+++ b/tests/libntp/run-ymd2yd.c
@@ -42,7 +42,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpd/run-leapsec.c b/tests/ntpd/run-leapsec.c
index 162dbdab8..c02cfa896 100644
--- a/tests/ntpd/run-leapsec.c
+++ b/tests/ntpd/run-leapsec.c
@@ -76,7 +76,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpd/run-ntp_prio_q.c b/tests/ntpd/run-ntp_prio_q.c
index 870a9b33b..35af443de 100644
--- a/tests/ntpd/run-ntp_prio_q.c
+++ b/tests/ntpd/run-ntp_prio_q.c
@@ -49,7 +49,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpd/run-rc_cmdlength.c b/tests/ntpd/run-rc_cmdlength.c
index 2799b5b3a..c6fb7ccf7 100644
--- a/tests/ntpd/run-rc_cmdlength.c
+++ b/tests/ntpd/run-rc_cmdlength.c
@@ -43,7 +43,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpd/run-t-ntp_scanner.c b/tests/ntpd/run-t-ntp_scanner.c
index 1d8d8d869..62d3ed308 100644
--- a/tests/ntpd/run-t-ntp_scanner.c
+++ b/tests/ntpd/run-t-ntp_scanner.c
@@ -48,7 +48,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpd/run-t-ntp_signd.c b/tests/ntpd/run-t-ntp_signd.c
index ff670d667..662cada0b 100644
--- a/tests/ntpd/run-t-ntp_signd.c
+++ b/tests/ntpd/run-t-ntp_signd.c
@@ -47,7 +47,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====
diff --git a/tests/ntpq/run-t-ntpq.c b/tests/ntpq/run-t-ntpq.c
index 165b19546..ccf2a06c8 100644
--- a/tests/ntpq/run-t-ntpq.c
+++ b/tests/ntpq/run-t-ntpq.c
@@ -40,7 +40,7 @@ void resetTest(void)
   setUp();
 }
 
-char *progname;
+char const *progname;
 
 
 //=======MAIN=====