From patchwork Thu Feb 16 07:15:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 728512 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 3vP6rh0TZyz9s8N for ; Thu, 16 Feb 2017 18:16:04 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vP6rg6pGSzDqGl for ; Thu, 16 Feb 2017 18:16:03 +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 3vP6rR70NjzDq60 for ; Thu, 16 Feb 2017 18:15:51 +1100 (AEDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1G7DesW137834 for ; Thu, 16 Feb 2017 02:15:50 -0500 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0a-001b2d01.pphosted.com with ESMTP id 28mq9req3t-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 16 Feb 2017 02:15:49 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 16 Feb 2017 02:15:48 -0500 Received: from d01dlp01.pok.ibm.com (9.56.250.166) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 16 Feb 2017 02:15:46 -0500 Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id B954138C8041 for ; Thu, 16 Feb 2017 02:15:46 -0500 (EST) Received: from b01ledav03.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1G7Febo61014216; Thu, 16 Feb 2017 07:15:45 GMT Received: from b01ledav03.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E3C75B2052; Thu, 16 Feb 2017 02:15:44 -0500 (EST) Received: from birb.localdomain (unknown [9.81.206.231]) by b01ledav03.gho.pok.ibm.com (Postfix) with SMTP id 1B534B205A; Thu, 16 Feb 2017 02:15:43 -0500 (EST) Received: from ka1.ozlabs.ibm.com (localhost.localdomain [127.0.0.1]) by birb.localdomain (Postfix) with ESMTP id 493BF22B9627; Thu, 16 Feb 2017 18:15:39 +1100 (AEDT) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Thu, 16 Feb 2017 18:15:37 +1100 X-Mailer: git-send-email 2.1.4 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021607-0040-0000-0000-000002A45875 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006625; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000203; SDB=6.00822653; UDB=6.00402479; IPR=6.00600101; BA=6.00005143; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00014300; XFM=3.00000011; UTC=2017-02-16 07:15:47 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021607-0041-0000-0000-0000069776EF Message-Id: <1487229337-16126-1-git-send-email-stewart@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-16_04:, , 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-1612050000 definitions=main-1702160074 Subject: [Skiboot] [PATCH] test/hello_world: use P9MAMBO_ to differentiate from P8 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" Helps if you're building mambo from source (or haven't used the packages in exactly the way they install) to ensure you run both the p8 and p9 mambo simulators for testing. Signed-off-by: Stewart Smith --- test/hello_world/run_mambo_p9_hello_world.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/hello_world/run_mambo_p9_hello_world.sh b/test/hello_world/run_mambo_p9_hello_world.sh index 1653a5265ee8..9309a2f4c1f7 100755 --- a/test/hello_world/run_mambo_p9_hello_world.sh +++ b/test/hello_world/run_mambo_p9_hello_world.sh @@ -1,16 +1,15 @@ #!/bin/bash - -if [ -z "$MAMBO_PATH" ]; then - MAMBO_PATH=/opt/ibm/systemsim-p9/ +if [ -z "$P9MAMBO_PATH" ]; then + P9MAMBO_PATH=/opt/ibm/systemsim-p9/ fi -if [ -z "$MAMBO_BINARY" ]; then - MAMBO_BINARY="/run/p9/power9" +if [ -z "$P9MAMBO_BINARY" ]; then + P9MAMBO_BINARY="/run/p9/power9" fi -if [ ! -x "$MAMBO_PATH/$MAMBO_BINARY" ]; then - echo "Could not find executable MAMBO_BINARY ($MAMBO_PATH/$MAMBO_BINARY). Skipping hello_world test"; +if [ ! -x "$P9MAMBO_PATH/$P9MAMBO_BINARY" ]; then + echo "Could not find executable P9MAMBO_BINARY ($P9MAMBO_PATH/$MAMBO_BINARY). Skipping hello_world test"; exit 0; fi @@ -38,7 +37,7 @@ trap "rm -f -- '$t'" EXIT ( cd external/mambo; cat <