From 934a4426510f71f42248918a50342f4f12661faa Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Fri, 12 Mar 2021 15:46:04 -0800 Subject: [PATCH] we only need to run connectTest once in updateTest.bash Signed-off-by: Matthew Stidham --- py-scripts/regression_test.sh | 6 ++++++ updateTest.bash | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh index 1b39823d..9c619789 100755 --- a/py-scripts/regression_test.sh +++ b/py-scripts/regression_test.sh @@ -4,6 +4,12 @@ # OPTION TWO: ./test_all_scripts.sh 4 5 : this command runs py-script commands (in testCommands array) that include the py-script options beginning with 4 and 5 (inclusive) in case function ret_case_num. #Variables +FILE="/tmp/gui-update.lock" +if test -f "$FILE"; then + echo "Finish updating your GUI" + exit 0 +fi + HOMEPATH=$(realpath ~) if [[ ${#1} -gt 0 ]]; then diff --git a/updateTest.bash b/updateTest.bash index 52dcee55..fb97b1dd 100755 --- a/updateTest.bash +++ b/updateTest.bash @@ -160,15 +160,15 @@ pgrep java &>/dev/null && killall -9 java sleep 1 #-daemon -touch "$D_MODE" -start_gui -python3 ${scripts}/connectTest.py &> $CTLH +#touch "$D_MODE" +#start_gui +#python3 ${scripts}/connectTest.py &> $CTLH# -echo "== HEADLESS =============================================" >> $ST -head $CTLH >> $ST -echo "===============================================" >> $ST -rm -f "$D_MODE" -pgrep java &>/dev/null && killall -9 java +#echo "== HEADLESS =============================================" >> $ST +#head $CTLH >> $ST +#echo "===============================================" >> $ST +#rm -f "$D_MODE" +#pgrep java &>/dev/null && killall -9 java start_gui connect_fail=0 wait_8080 || connect_fail=1