[Git][NTPsec/ntpsec][checking] 2 commits: Removed unneeded commented out code in bin_test.

[Ian Bruene]

Ian Bruene pushed to branch checking at NTPsec / ntpsec


Commits:
83e6769d by Ian Bruene at 2018-10-01T14:32:45Z
Removed unneeded commented out code in bin_test.

- - - - -
284efe0b by Ian Bruene at 2018-10-01T14:50:55Z
Added missing --version for ntpleapfetch.

- - - - -


2 changed files:

- ntpclients/ntpleapfetch
- wafhelpers/bin_test.py


Changes:

=====================================
ntpclients/ntpleapfetch
=====================================
@@ -115,6 +115,13 @@ EOF
    return 0
 }
 
+function displayVersion {
+            cat <<EOF
+ntpleapfetch ntpsec- at NTPSEC_VERSION_EXTENDED@
+EOF
+   return 0
+}
+
 # Default: Use syslog for logging if running under cron
 
 SYSLOG="$CRONJOB"
@@ -124,6 +131,11 @@ if [ "$1" = "--help" ]; then
     exit 0
 fi
 
+if [ "$1" = "--version" ]; then
+    displayVersion
+    exit 0
+fi
+
 # Parse options
 
 while getopts 46p:P:s:e:f:Fc:r:i:lLt:hqvz:Z opt; do


=====================================
wafhelpers/bin_test.py
=====================================
@@ -26,12 +26,6 @@ cmd_map = {
     ("main/ntpclients/ntpwait", "--version"): "ntpwait %s\n" % verStr,
     ("main/ntpfrob/ntpfrob", "-V"): "ntpfrob %s\n" % verStr,
     ("main/ntptime/ntptime", "-V"): "ntptime %s\n" % verStr,
-    #("main/attic/sht", "--version"): "sht %s\n" % verStr,
-
-    # Perl library
-    #       ("main/ntpclients/ntptrace", ""): br'',
-    #       ("main/ntpclients/ntpwait", ""): br'',
-    #       ("main/ntpclients/ntpsweep", ""): br'',
 }
 
 
@@ -54,8 +48,6 @@ def run(cmd, reg):
 
     stdout, stderr = p.communicate()
 
-    #print("\nstdout:", stdout)
-    #print("\nstderr:", stderr)
     if (stdout == reg) or (stderr == reg):
         check = True
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/d4dd792e6b89854c49167b982ffa2e21630653c5...284efe0b781db8d1887570357deab6ee654dd5f9

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/d4dd792e6b89854c49167b982ffa2e21630653c5...284efe0b781db8d1887570357deab6ee654dd5f9
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20181001/3fdc938d/attachment-0001.html>