Merge pull request #361 from smuppand/sched_dcvs

shellcheck: fix cleanup, quoting, and dead trailing logs in CPU_affinity and Freq_Scaling

Author: vnarapar

Runner/suites/Kernel/DCVS/Freq_Scaling/run.sh

@@ -64,20 +64,20 @@ if [ "$miss" -eq 1 ]; then
 fi
 
 log_info "Reading scaling governor..."
-GOVERNOR=$(cat $CPUFREQ_PATH/scaling_governor)
+GOVERNOR=$(cat "$CPUFREQ_PATH"/scaling_governor)
 log_info "Current governor: $GOVERNOR"
 
 log_info "Reading min/max frequencies"
-MIN_FREQ=$(cat $CPUFREQ_PATH/cpuinfo_min_freq)
-MAX_FREQ=$(cat $CPUFREQ_PATH/cpuinfo_max_freq)
+MIN_FREQ=$(cat "$CPUFREQ_PATH"/cpuinfo_min_freq)
+MAX_FREQ=$(cat "$CPUFREQ_PATH"/cpuinfo_max_freq)
 log_info "CPU frequency range: $MIN_FREQ - $MAX_FREQ"
 
 log_info "Triggering frequency update via governor"
 dd if=/dev/urandom of=/dev/null bs=1M count=1000 &
 LOAD_PID=$!
 sleep 2
 
-CURRENT_FREQ=$(cat $CPUFREQ_PATH/scaling_cur_freq)
+CURRENT_FREQ=$(cat "$CPUFREQ_PATH"/scaling_cur_freq)
 log_info "Observed frequency under load: $CURRENT_FREQ"
 
 kill $LOAD_PID
@@ -91,5 +91,3 @@ else
     echo "$TESTNAME FAIL" > "$res_file"
     exit 1
 fi
-
-log_info "----------- Completed $TESTNAME Test ------------"

Runner/suites/Kernel/Scheduler/CPU_affinity/run.sh

@@ -33,6 +33,9 @@ cd "$test_path" || exit 1
 # shellcheck disable=SC2034
 res_file="./$TESTNAME.res"
 
+TASK_PID=""
+trap '[ -n "${TASK_PID:-}" ] && kill "$TASK_PID" 2>/dev/null || true' EXIT INT TERM
+
 log_info "----------------------------------------------------"
 log_info "-------- Starting $TESTNAME Functional Test --------"
 
@@ -59,14 +62,14 @@ TASK_PID=$!
 sleep 2
 
 log_info "Checking CPU affinity of task $TASK_PID..."
-CPU_AFFINITY=$(taskset -p $TASK_PID | awk -F: '{print $2}' | xargs)
+CPU_AFFINITY=$(taskset -p "$TASK_PID" | awk -F: '{print $2}' | xargs)
 log_info "CPU affinity: $CPU_AFFINITY"
 
 log_info "Setting affinity to CPU 0"
-taskset -pc 0 $TASK_PID > /dev/null
+taskset -pc 0 "$TASK_PID" > /dev/null
 sleep 1
 
-NEW_AFFINITY=$(taskset -p $TASK_PID | awk -F: '{print $2}' | xargs)
+NEW_AFFINITY=$(taskset -p "$TASK_PID" | awk -F: '{print $2}' | xargs)
 if [ "$NEW_AFFINITY" = "1" ]; then
     log_pass "Successfully set CPU affinity"
     echo "$TESTNAME PASS" > "$res_file"
@@ -76,7 +79,7 @@ else
 fi
 
 log_info "Checking scheduling policy of task..."
-SCHED_POLICY=$(chrt -p $TASK_PID | grep "scheduling policy" | awk -F: '{print $2}' | xargs)
+SCHED_POLICY=$(chrt -p "$TASK_PID" | grep "scheduling policy" | awk -F: '{print $2}' | xargs)
 log_info "Scheduling Policy: $SCHED_POLICY"
 
 if echo "$SCHED_POLICY" | grep -q "SCHED_OTHER"; then
@@ -88,7 +91,3 @@ else
     echo "$TESTNAME FAIL" > "$res_file"
     exit 1
 fi
-
-kill $TASK_PID
-echo "$TESTNAME PASS" > $test_path/$TESTNAME.res
-log_info "-------- Completed $TESTNAME Functional Test --------"