[Git][NTPsec/ntpsec][master] tests/option-tester.sh now gets ntpq from $build/main/ntpclients

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
7d119307 by Hal Murray at 2017-09-26T10:45:27-07:00
tests/option-tester.sh now gets ntpq from $build/main/ntpclients

- - - - -


1 changed file:

- tests/option-tester.sh


Changes:

=====================================
tests/option-tester.sh
=====================================
--- a/tests/option-tester.sh
+++ b/tests/option-tester.sh
@@ -30,19 +30,17 @@ doit ()
   fi
   if [ "$WAF1" != 0 -o "$WAF2" != 0 -o "$WAF3" != 0 ] 
   then
-    echo                                      | tee -a $DIR/test.log
-    echo "Trouble with $DIR"                  | tee -a $DIR/test.log
+    echo                                          | tee -a $DIR/test.log
+    echo "Trouble with $DIR"                      | tee -a $DIR/test.log
   else
-    echo -n "VERSION: "                       | tee -a $DIR/test.log
-    ./$DIR/main/ntpd/ntpd --version           | tee -a $DIR/test.log
-    cd ntpclients
-      echo -n "VERSION: "                     | tee -a ../$DIR/test.log
-      ./$DIR/main/ntpclients/ntpq --version   | tee -a ../$DIR/test.log
-      echo -n "VERSION: "                     | tee -a ../$DIR/test.log
-      ./$DIR/main/ntpclients/ntpdig --version | tee -a ../$DIR/test.log
-      echo -n "VERSION: "                     | tee -a ../$DIR/test.log
-      ./$DIR/main/ntpclients/ntpmon --version | tee -a ../$DIR/test.log
-    cd ..
+    echo -n "VERSION: "                           | tee -a $DIR/test.log
+    ./$DIR/main/ntpd/ntpd --version          2>&1 | tee -a $DIR/test.log
+    echo -n "VERSION: "                           | tee -a $DIR/test.log
+    ./$DIR/main/ntpclients/ntpq --version    2>&1 | tee -a $DIR/test.log
+    echo -n "VERSION: "                           | tee -a $DIR/test.log
+    ./$DIR/main/ntpclients/ntpdig --version  2>&1 | tee -a $DIR/test.log
+    echo -n "VERSION: "                           | tee -a $DIR/test.log
+    ./$DIR/main/ntpclients/ntpmon --version  2>&1 | tee -a $DIR/test.log
   fi
   echo
   echo



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/7d119307d4d337baafb02d8ad20bcbb9b71f28d1

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/7d119307d4d337baafb02d8ad20bcbb9b71f28d1
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/20170926/459a74d0/attachment.html>