#29 disable_retest=y now works as expected
Merged 5 years ago by jforbes. Opened 5 years ago by szydell.
szydell/kernel-tests master  into  master

file modified
+15 -14
@@ -39,20 +39,6 @@ 

  	mkdir $logdir

  fi

  

- if [ "$disable_retest" == "y" ]; then

- 	# Check if wanted test has been executed with current kernel

-         # version.

- 	for file in $(find $logdir -name \*.log.txt); do

- 		version_tested=$(cat $file | sed -n 3p | cut -d ' ' -f 2)

- 		test_executed=$(cat $file | sed -n 2p | cut -d ' ' -f 3)

- 

- 		if [ "$version_tested" == "$kver" -a "$test_executed" == "$testset" ]; then

- 			echo "The current kernel was already tested with this test, abort."

- 			exit 0

- 		fi

- 	done

- fi

- 

  args=y

  

  while [ $args = y ]
@@ -72,6 +58,21 @@ 

  	esac

  done

  

+ 

+ if [ "$disable_retest" == "y" ]; then

+         # Check if wanted test has been executed with current kernel

+         # version.

+         for file in $(find $logdir -name \*.log.txt); do

+                 version_tested=$(cat $file | sed -n 3p | cut -d ' ' -f 2)

+                 test_executed=$(cat $file | sed -n 2p | cut -d ' ' -f 3)

+ 

+                 if [ "$version_tested" == "$kver" -a "$test_executed" == "$testset" ]; then

+                         echo "The current kernel was already tested with this test, abort."

+                         exit 0

+                 fi

+         done

+ fi

+ 

  case $testset in

  minimal)

  	dirlist="minimal"

Code that checks if restest can be done is moved to the place
where $testset is properly set. Before, if you tried to run the test
different than 'default' (i.e. -t performance), with the previously tested
kernel, you couldn't.

Pull-Request has been merged by jforbes

5 years ago
Metadata