Autotest: simplify logic to compute test group result.

* lib/autotest/general.m4 (AT_INIT): Compactify result
computation logic.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 84aa1d07bfb379179952bd09628cd14fc7ce4c7c..d1fc70e86a0e11c555b4327e3b64c786d247a2d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Autotest: simplify logic to compute test group result.
+       * lib/autotest/general.m4 (AT_INIT): Compactify result
+       computation logic.
+
        New Autotest testsuite option --recheck.
        * lib/autotest/general.m4 (AT_INIT): New variable $at_recheck.
        Escape hyphen in $at_dir early.  Accept command line switch

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 1e38abe7c4d93af06f720f68c7e11d532a431a55..5f965fd28b3e2c18cca1d61d4d7d122737401f24 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1152,11 +1152,6 @@ _ATEOF
   $at_verbose AS_ECHO_N(["$at_group. $at_setup_line: "])
   AS_ECHO_N(["$at_group. $at_setup_line: "]) >> "$at_group_log"
   case $at_xfail:$at_status in
-    *:99)
-       at_msg='FAILED ('`cat "$at_check_line_file"`')'
-       at_res=fail
-       at_errexit=$at_errexit_p
-       ;;
     yes:0)
        at_msg="UNEXPECTED PASS"
        at_res=xpass
@@ -1172,16 +1167,16 @@ _ATEOF
        at_res=skip
        at_errexit=false
        ;;
+    no:* | *:99)
+       at_msg='FAILED ('`cat "$at_check_line_file"`')'
+       at_res=fail
+       at_errexit=$at_errexit_p
+       ;;
     yes:*)
        at_msg='expected failure ('`cat "$at_check_line_file"`')'
        at_res=xfail
        at_errexit=false
        ;;
-    no:*)
-       at_msg='FAILED ('`cat "$at_check_line_file"`')'
-       at_res=fail
-       at_errexit=$at_errexit_p
-       ;;
   esac
   echo "$at_res" > "$at_job_dir/$at_res"
   # In parallel mode, output the summary line only afterwards.