diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-06 15:43:35 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-06 15:59:59 +0100 |
| commit | 88dd3ec322aae5776a11e5112837f199ac83a374 (patch) | |
| tree | b8fb16127935d41d24a203aa8c705de3a46f51cb | |
| parent | 8c1e3ac28cbb902b540f776886a6556c40d3f601 (diff) | |
Some shells (like dash when invoked as /bin/sh) don't like '==' to test.
| -rw-r--r-- | test/scripts/testutils.sh | 2 | ||||
| -rwxr-xr-x | tools/getconfig.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh index d3a9672..657607b 100644 --- a/test/scripts/testutils.sh +++ b/test/scripts/testutils.sh @@ -43,7 +43,7 @@ do_merge() { ${top_srcdir}/tools/mergestatus.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg n=$((n-1)) treesize=$(get_treesize) - [ "${treesize}" == "${expected_treesize}" ] && return + [ "${treesize}" = "${expected_treesize}" ] && return sleep 1 done } diff --git a/tools/getconfig.sh b/tools/getconfig.sh index f73cf1b..aaab7ee 100755 --- a/tools/getconfig.sh +++ b/tools/getconfig.sh @@ -15,7 +15,7 @@ plopcontrolport=$(cat ${plopcontrolfile}) configversion=$(echo "configversion" | nc 127.0.0.1 ${plopcontrolport}) echo "version before reload: $configversion" getconfigresult=$(${BINDIR}/getconfig.py --localconfig ${localconfig} --dest ${globalconfig}) -if [ "$getconfigresult" == "newconfig" ]; then +if [ "$getconfigresult" = "newconfig" ]; then ${BINDIR}/compileconfig.py --localconfig ${localconfig} --config ${globalconfig} reloadresult=$(echo "reload" | nc 127.0.0.1 ${plopcontrolport}) echo $reloadresult |