testsuite.at: pwd for windows.

[sliver-openvswitch.git] / tests / testsuite.at

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 772a7eb..b045ae6 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -41,6 +41,12 @@ seq () {
         set `expr $1 + ${3-1}` $2 $3
     done
 }
+
+if test "$IS_WIN32" = "yes"; then
+    pwd () {
+        command pwd -W "$@"
+    }
+fi
 ]
 m4_divert_pop([PREPARE_TESTS])
 
@@ -53,6 +59,14 @@ m4_define([OVS_WAIT_UNTIL], [OVS_WAIT([$1], [$2])])
 m4_define([OVS_WAIT_WHILE],
   [OVS_WAIT([if $1; then return 1; else return 0; fi], [$2])])
 
+dnl OVS_APP_EXIT_AND_WAIT(DAEMON)
+dnl
+dnl Ask the daemon named DAEMON to exit, via ovs-appctl, and then waits for it
+dnl to exit.
+m4_define([OVS_APP_EXIT_AND_WAIT],
+  [ovs-appctl -t $1 exit
+   OVS_WAIT_WHILE([test -e $1.pid])])
+
 dnl ON_EXIT([COMMANDS])
 dnl
 dnl Adds the shell COMMANDS to a collection executed when the current test