Fix: test_crash: don't kill first app twice
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 9 Aug 2019 21:01:35 +0000 (17:01 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 21 Aug 2019 16:12:42 +0000 (09:12 -0700)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
tests/regression/tools/crash/test_crash

index 13909c1bfc04b7fe1d4c55168559240877a72e1a..30af291c613ddbb77d924c98a31cc7b9a8748dae 100755 (executable)
@@ -31,6 +31,8 @@ NR_ITER=-1
 # Temp file output
 OUTPUT_DIR=$(mktemp -d)
 
+LAST_APP_PID=
+
 NUM_TESTS=77
 
 source $TESTDIR/utils/utils.sh
@@ -50,6 +52,7 @@ function start_test_app()
        # Start application with a temporary file.
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
        ret=$?
+       LAST_APP_PID="${!}"
        APPS_PID="${APPS_PID} ${!}"
        ok $ret "Start application to trace"
 
@@ -81,6 +84,7 @@ function stop_test_app()
                diag "Stopping $p"
                kill ${p} 2>/dev/null
                wait ${p} 2>/dev/null
+               diag "Stopped $p"
        done
 }
 
@@ -118,7 +122,7 @@ function test_shm_path_per_pid()
        diag "Shm: check folder creation and structure"
 
        start_test_app
-       first_app_pid=$APPS_PID
+       first_app_pid=$LAST_APP_PID
        shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
 
        file_count=$(echo "$shm_session_path"| wc -l)
@@ -141,6 +145,7 @@ function test_shm_path_per_pid()
        diag "Shm: check basic creation of second ust application"
 
        start_test_app
+       second_app_pid=$LAST_APP_PID
        second_pid_path=$(find $shm_session_path/ust/pid -mindepth 1 -maxdepth 1)
        ok $? "Pid path exist found $second_pid_path"
 
@@ -150,6 +155,7 @@ function test_shm_path_per_pid()
 
        # Stop first test application and check for cleanup
        stop_test_app "$first_app_pid"
+       APPS_PID="$second_app_pid"
        verify_path_dont_exists "$first_pid_path"
        ok $? "First pid cleanup"
 
This page took 0.035055 seconds and 4 git commands to generate.