[Git][NTPsec/ntpsec][master] 2 commits: Clean up bin_test

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
82b4cda7 by Matt Selsky at 2016-08-26T01:10:11-04:00
Clean up bin_test

tg2/propdelay were both removed
bumpclock was merged into ntpfrob

- - - - -
116b0230 by Matt Selsky at 2016-08-26T01:10:12-04:00
Typos

- - - - -


3 changed files:

- docs/includes/ntpfrob-body.txt
- ntpstats/ntpviz
- wafhelpers/bin_test.py


Changes:

=====================================
docs/includes/ntpfrob-body.txt
=====================================
--- a/docs/includes/ntpfrob-body.txt
+++ b/docs/includes/ntpfrob-body.txt
@@ -24,7 +24,7 @@ utilities.
 +-A+::
   Display the kernel variable +tick+.
 +-b+ 'bump'::
-  Bump the clock by a specified number of microceseconds.
+  Bump the clock by a specified number of microseconds.
 +-c+::
   Compute and display clock jitter.
 +-e+::


=====================================
ntpstats/ntpviz
=====================================
--- a/ntpstats/ntpviz
+++ b/ntpstats/ntpviz
@@ -343,7 +343,7 @@ plot \
         histogram_data = ["%s %s\n" % (val, cnt[val]) for val in vals]
         return plot_template.replace('@', '%') + "".join(histogram_data)
 
-# Multplotting can't live inside NTPViz because it consumes a list
+# Multiplotting can't live inside NTPViz because it consumes a list
 # of such objects, not a single one.
 
 def local_offset_multiplot(statlist):


=====================================
wafhelpers/bin_test.py
=====================================
--- a/wafhelpers/bin_test.py
+++ b/wafhelpers/bin_test.py
@@ -7,13 +7,11 @@ cmd_map = {
 	("main/ntpd/ntpd",				"-invalid"):			r'.*must be run as root, not uid.*',
 	("main/ntpdig/ntpdig",			"time.apple.com"):		r'.*time.apple.com.*',
 	("main/ntpfrob/ntpfrob",			"-h"):				r'.*illegal option.*',
+	("main/ntpfrob/ntpfrob",			"-b 100000"):		r".*Bumping clock by 100000 microseconds.*",
 	("main/ntpkeygen/ntpkeygen",	  "-M"):				r'.*Generating new md5 file and link.*',
 	("main/ntpq/ntpq",  			  "-p"):				r'.*remote.*jitter.*',
 	("main/ntptime/ntptime",		  None):				r'.*ntp_gettime\(\) returns code 0 \(OK\).*',
-	("main/util/bumpclock", 		  None):				r".*Bumping clock by 100000 microseconds.*",
-	("main/util/propdelay", 		  "1","1", "2"," 2"):	r'.*summer propagation, height 350 km, hops 1, delay 0.00239626 seconds.*',
 	("main/util/sht",				  "2:r"):				r'.*reader.*',
-	("main/util/tg2",				  "--help"):			r'.*illegal option.*',
 
 # XXX: Need to figure out how to test this.
 #	("main/util/hist",  			  ""):  				r'',



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/9880a23298e2b563b698b3f02488a81f4ea86b35...116b0230897cdacffcf31672152dce3a32bde08b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160826/48a3d8db/attachment.html>