[Git][NTPsec/ntpsec][master] 2 commits: Indent comment to match code

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
8ed72e82 by Hal Murray at 2018-11-30T20:21:41Z
Indent comment to match code

- - - - -
57f94dac by Hal Murray at 2018-12-01T10:03:43Z
Don't test ntpmon if no curses (avoid error)

- - - - -


2 changed files:

- wafhelpers/bin_test.py
- wscript


Changes:

=====================================
wafhelpers/bin_test.py
=====================================
@@ -23,7 +23,6 @@ cmd_map2 = {
     ("main/ntpclients/ntpdig", "--version"): "ntpdig %s\n" % verStr,
     ("main/ntpclients/ntpkeygen", "--version"): "ntpkeygen %s\n" % verStr,
     ("main/ntpclients/ntpq", "--version"): "ntpq %s\n" % verStr,
-    ("main/ntpclients/ntpmon", "--version"): "ntpmon %s\n" % verStr,
     ("main/ntpclients/ntplogtemp", "--version"): "ntplogtemp %s\n" % verStr,
     ("main/ntpclients/ntpsnmpd", "--version"): "ntpsnmpd %s\n" % verStr,
     ("main/ntpclients/ntpsweep", "--version"): "ntpsweep %s\n" % verStr,
@@ -31,6 +30,9 @@ cmd_map2 = {
     ("main/ntpclients/ntpviz", "--version"): "ntpviz %s\n" % verStr,
     ("main/ntpclients/ntpwait", "--version"): "ntpwait %s\n" % verStr
 }
+cmd_map3 = {    # Need curses
+    ("main/ntpclients/ntpmon", "--version"): "ntpmon %s\n" % verStr,
+}
 
 
 def run(cmd, reg, pythonic):
@@ -70,6 +72,10 @@ def cmd_bin_test(ctx, config):
     """Run a suite of binary tests."""
     fails = 0
 
+    if ctx.env['PYTHON_CURSES']:
+      for cmd in cmd_map3:
+        cmd_map2[cmd] = cmd_map3[cmd]
+
     for cmd in sorted(cmd_map):
         if not run(cmd, cmd_map[cmd], False):
             fails += 1


=====================================
wscript
=====================================
@@ -600,10 +600,10 @@ int main(int argc, char **argv) {
         msg="Checking for OpenSSL (via pkg-config)",
         define_name='', mandatory=False,
     ):
-    # Very old versions of OpenSSL don't have cmac support.
-    # This gives a sane(er) error message.
-    # It would be possible to make CMAC support optional by adding
-    # appropriate #ifdefs to the code.
+        # Very old versions of OpenSSL don't have cmac support.
+        # This gives a sane(er) error message.
+        # It would be possible to make CMAC support optional by adding
+        # appropriate #ifdefs to the code.
         openssl_headers = (
             "openssl/evp.h",
             "openssl/cmac.h",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/c433b80d98a162b9e1731c04bb03824752eda200...57f94dacb506d89563dc984f420047d8af1f11cf

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/c433b80d98a162b9e1731c04bb03824752eda200...57f94dacb506d89563dc984f420047d8af1f11cf
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/20181201/5b53d547/attachment-0001.html>