summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-05-09 16:17:46 +0900
committerLorenzo Colitti <lorenzo@google.com>2020-05-09 16:26:04 +0900
commit8506ff9b65ecfbf67beed28048159ae04171d5ed (patch)
treefada815b54126ee4cb50c33f6656388fa5a8968f /net/test
parentb2ce5d38512bf4f47cdc0814252b1438bd5e7f8d (diff)
downloadkernel_tests-8506ff9b65ecfbf67beed28048159ae04171d5ed.tar.gz
kernel_tests-8506ff9b65ecfbf67beed28048159ae04171d5ed.tar.bz2
kernel_tests-8506ff9b65ecfbf67beed28048159ae04171d5ed.zip
Fix run_net_test.sh --norun.
This was likely broken by a change to make the script run all_tests.sh if called with no arguments. It is useful to keep this running because it is used by parallel_tests.sh which is useful to find flaky tests. Test: treehugger Test: build and run: ../net_test/run_net_test.sh Test: build only: ../net_test/run_net_test.sh --norun Test: run only: ../net_test/run_net_test.sh --nobuild bpf_test.py Test: parallel tests: ../net_test/parallel_tests.sh 10 10 srcaddr_selection_test.py Test: neither build nor run fails: ../net_test/run_net_test.sh --nobuild --norun Change-Id: I86162af99dea832d18206aae3dee1889b71c879d
Diffstat (limited to 'net/test')
-rwxr-xr-xnet/test/run_net_test.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index ebfb15f3..d1a66f58 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -178,16 +178,17 @@ fi
test_args=${@:2}
function isRunningTest() {
- [[ -n "$test" ]] && ! (( norun ))
+ ! (( norun ))
}
function isBuildOnly() {
- [[ -z "$test" ]] && (( norun )) && ! (( nobuild ))
+ (( norun )) && ! (( nobuild ))
}
if ! isRunningTest && ! isBuildOnly; then
echo "Usage:" >&2
- echo " $0 [--builder] [--readonly|--ro|--readwrite|--rw] [--nobuild] [--verbose] <test>" >&2
+ echo " $0 [--builder] [--readonly|--ro|--readwrite|--rw] [--nobuild] [--verbose] [<test>]" >&2
+ echo " - if [<test>] is not specified, run all_tests.sh" >&2
echo " $0 --norun" >&2
exit 1
fi