From 28165f7b4e54a8b4d8e1139d317bf06961515e84 Mon Sep 17 00:00:00 2001 From: Bob Lantz <rlantz@cs.stanford.edu> Date: Sun, 25 Aug 2013 16:27:43 -0700 Subject: [PATCH] Check `make test` results --- util/vm/build.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/util/vm/build.py b/util/vm/build.py index 07c99e86..4cd257f2 100755 --- a/util/vm/build.py +++ b/util/vm/build.py @@ -408,7 +408,7 @@ def interact( vm ): log( '* Testing Mininet' ) vm.sendline( 'sudo mn --test pingall' ) if vm.expect( [ ' 0% dropped', pexpect.TIMEOUT ], timeout=45 ) == 0: - log( '* Sanity check succeeded' ) + log( '* Sanity check OK' ) else: log( '* Sanity check FAILED' ) vm.expect( prompt ) @@ -419,6 +419,15 @@ def interact( vm ): vm.expect( prompt ) log( '* Running make test' ) vm.sendline( 'cd ~/mininet; sudo make test' ) + # We should change "make test" to report the number of + # successful and failed tests. For now, we have to + # know the time for each test, which means that this + # script will have to change as we add more tests. + for test in range( 0, 2 ): + if vm.expect( [ 'OK', 'FAILED', pexpect.timeout ], timeout=60 ) == 0: + log( '* Test', test, 'OK' ) + else: + log( '* Test', test, 'FAILED' ) vm.expect( prompt ) log( '* Shutting down' ) vm.sendline( 'sync; sudo shutdown -h now' ) -- GitLab