From patchwork Fri Mar 24 01:30:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 743019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vq5Td6Jr0z9s7R for ; Fri, 24 Mar 2017 12:30:45 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vq5Td5PhRzDqZs for ; Fri, 24 Mar 2017 12:30:45 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vq5TX198NzDq5W for ; Fri, 24 Mar 2017 12:30:39 +1100 (AEDT) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2O1NwFY108917 for ; Thu, 23 Mar 2017 21:30:28 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 29c4yx5h4d-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 23 Mar 2017 21:30:27 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Mar 2017 19:30:27 -0600 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 23 Mar 2017 19:30:25 -0600 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v2O1UOsO15008208; Thu, 23 Mar 2017 18:30:25 -0700 Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D7A65BE03B; Thu, 23 Mar 2017 19:30:24 -0600 (MDT) Received: from birb.localdomain (unknown [9.185.16.50]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id 6A98DBE038; Thu, 23 Mar 2017 19:30:24 -0600 (MDT) Received: from ka1.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by birb.localdomain (Postfix) with ESMTP id 80A25228D8D6; Fri, 24 Mar 2017 12:30:20 +1100 (AEDT) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Fri, 24 Mar 2017 12:30:19 +1100 X-Mailer: git-send-email 2.1.4 X-TM-AS-GCONF: 00 x-cbid: 17032401-0020-0000-0000-00000BA17C9C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006837; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000206; SDB=6.00838038; UDB=6.00412054; IPR=6.00615800; BA=6.00005234; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014784; XFM=3.00000013; UTC=2017-03-24 01:30:26 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17032401-0021-0000-0000-00005B1BDA17 Message-Id: <1490319019-23463-1-git-send-email-stewart@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-23_23:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703240011 Subject: [Skiboot] [PATCH] Mambo/Qemu boot tests: expect (and fail) on checkstop X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This allows us to fail a lot faster if we checkstop Signed-off-by: Stewart Smith --- test/hello_world/run_mambo_hello_world.sh | 1 + test/hello_world/run_mambo_p9_hello_world.sh | 1 + test/hello_world/run_qemu_hello_world.sh | 1 + test/run_mambo_boot_test.sh | 1 + test/run_qemu-jessie-debian-installer_boot_test.sh | 1 + test/run_qemu_boot_test.sh | 1 + test/sreset_world/run_mambo_p9_sreset.sh | 3 +++ test/sreset_world/run_mambo_sreset.sh | 3 +++ 8 files changed, 12 insertions(+) diff --git a/test/hello_world/run_mambo_hello_world.sh b/test/hello_world/run_mambo_hello_world.sh index 5b63ce0c6189..5bb92bced97d 100755 --- a/test/hello_world/run_mambo_hello_world.sh +++ b/test/hello_world/run_mambo_hello_world.sh @@ -42,6 +42,7 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/hello_world/run_hello_world.tcl expect { timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1;} "Execution stopped: Sim Support exit requested stop" } wait diff --git a/test/hello_world/run_mambo_p9_hello_world.sh b/test/hello_world/run_mambo_p9_hello_world.sh index 9309a2f4c1f7..eee0f733981a 100755 --- a/test/hello_world/run_mambo_p9_hello_world.sh +++ b/test/hello_world/run_mambo_p9_hello_world.sh @@ -41,6 +41,7 @@ spawn $P9MAMBO_PATH/$P9MAMBO_BINARY -n -f ../../test/hello_world/run_hello_world expect { timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1;} "Execution stopped: Sim Support exit requested stop" } wait diff --git a/test/hello_world/run_qemu_hello_world.sh b/test/hello_world/run_qemu_hello_world.sh index bcd0f563ae42..e08f851f2b08 100755 --- a/test/hello_world/run_qemu_hello_world.sh +++ b/test/hello_world/run_qemu_hello_world.sh @@ -38,6 +38,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 1G -M powernv -kernel $SKIBOOT_ZIMAGE -nographi expect { timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1;} "Hello World!" } close diff --git a/test/run_mambo_boot_test.sh b/test/run_mambo_boot_test.sh index e028330e1869..fe0be0e3b63f 100755 --- a/test/run_mambo_boot_test.sh +++ b/test/run_mambo_boot_test.sh @@ -52,6 +52,7 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/run_boot_test.tcl expect { timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1; } "Execution stopped: Sim Support exit requested stop" } wait diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh index 36878a74d2ad..1fcda1199cc2 100755 --- a/test/run_qemu-jessie-debian-installer_boot_test.sh +++ b/test/run_qemu-jessie-debian-installer_boot_test.sh @@ -48,6 +48,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 2G -M powernv -kernel debian-jessie-vmlinux -in expect { timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1;} "Starting system log daemon" } close diff --git a/test/run_qemu_boot_test.sh b/test/run_qemu_boot_test.sh index 48abafa08ed2..b984afc22aef 100755 --- a/test/run_qemu_boot_test.sh +++ b/test/run_qemu_boot_test.sh @@ -41,6 +41,7 @@ spawn $QEMU_PATH/$QEMU_BINARY -m 3G -M powernv -kernel $SKIBOOT_ZIMAGE -nographi expect { timeout { send_user "\nTimeout waiting for petitboot\n"; exit 1 } eof { send_user "\nUnexpected EOF\n;" exit 1 } +"Machine Check Stop" { exit 1; } "Welcome to Petitboot" } close diff --git a/test/sreset_world/run_mambo_p9_sreset.sh b/test/sreset_world/run_mambo_p9_sreset.sh index b69fe173b16d..2d0d51a28fe3 100755 --- a/test/sreset_world/run_mambo_p9_sreset.sh +++ b/test/sreset_world/run_mambo_p9_sreset.sh @@ -40,16 +40,19 @@ spawn $P9MAMBO_PATH/$P9MAMBO_BINARY -n -f ../../test/sreset_world/run_sreset_wor expect { timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 } eof { send_user "\nUnexpected EOF\n"; exit 1 } +"Machine Check Stop" { exit 1;} "Hello World!" } expect { timeout { send_user "\nTimeout waiting for Hello SRESET\n"; exit 1 } eof { send_user "\nUnexpected EOF\n"; exit 1 } +"Machine Check Stop" { exit 1;} "Hello SRESET!" } expect { timeout { send_user "\nTimeout waiting for shutdown\n"; exit 1} eof { send_user "\nUnexpected EOF\n"; exit 1} +"Machine Check Stop" { exit 1;} "Execution stopped: Sim Support exit requested stop" } wait diff --git a/test/sreset_world/run_mambo_sreset.sh b/test/sreset_world/run_mambo_sreset.sh index 1733c65878eb..281c466c6221 100755 --- a/test/sreset_world/run_mambo_sreset.sh +++ b/test/sreset_world/run_mambo_sreset.sh @@ -42,16 +42,19 @@ spawn $MAMBO_PATH/$MAMBO_BINARY -n -f ../../test/sreset_world/run_sreset_world.t expect { timeout { send_user "\nTimeout waiting for hello world\n"; exit 1 } eof { send_user "\nUnexpected EOF\n"; exit 1 } +"Machine Check Stop" { exit 1;} "Hello World!" } expect { timeout { send_user "\nTimeout waiting for Hello SRESET\n"; exit 1 } eof { send_user "\nUnexpected EOF\n"; exit 1 } +"Machine Check Stop" { exit 1;} "Hello SRESET!" } expect { timeout { send_user "\nTimeout waiting for shutdown\n"; exit 1} eof { send_user "\nUnexpected EOF\n"; exit 1} +"Machine Check Stop" { exit 1;} "Execution stopped: Sim Support exit requested stop" } wait