From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 13 Jun 2010 06:38:09 +0000 (+0200)
Subject: Autotest: simplify logic to compute test group result.
X-Git-Tag: v2.66~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3e31f6dc457512879823bcf0f35d6cb175c45e7;p=thirdparty%2Fautoconf.git

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 84aa1d07..d1fc70e8 100644
--- 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 1e38abe7..5f965fd2 100644
--- 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.