From patchwork Tue Aug 11 12:31:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 40604 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7BCSUAS001471 for ; Tue, 11 Aug 2009 12:28:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753064AbZHKM20 (ORCPT ); Tue, 11 Aug 2009 08:28:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752706AbZHKM2Z (ORCPT ); Tue, 11 Aug 2009 08:28:25 -0400 Received: from mx2.redhat.com ([66.187.237.31]:58334 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752610AbZHKM2Y (ORCPT ); Tue, 11 Aug 2009 08:28:24 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7BCSPdh030949; Tue, 11 Aug 2009 08:28:25 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7BCSO6I026821; Tue, 11 Aug 2009 08:28:24 -0400 Received: from localhost.localdomain (dhcp-1-31.tlv.redhat.com [10.35.1.31]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7BCSK66032142; Tue, 11 Aug 2009 08:28:23 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH] KVM test: kvm_tests.cfg.sample: improve shell_prompt regular expressions Date: Tue, 11 Aug 2009 15:31:06 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Require that shell prompts start at the beginning of the line (^) and be followed by nothing more than whitespace (\s*$). Also remove the length limitation from Windows prompts, and do not restrict them to C:\. Also do not require RHEL and Fedora prompts to contain 'root@'. Signed-off-by: Michael Goldish --- client/tests/kvm/kvm_tests.cfg.sample | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample index 05a1ca7..7a896fe 100644 --- a/client/tests/kvm/kvm_tests.cfg.sample +++ b/client/tests/kvm/kvm_tests.cfg.sample @@ -171,7 +171,7 @@ variants: variants: - Fedora: no setup - shell_prompt = "\[root@.{0,50}][\#\$] " + shell_prompt = "^\[.*\][\#\$]\s*$" variants: - 8.32: @@ -253,7 +253,7 @@ variants: md5sum_1m = 768ca32503ef92c28f2d144f2a87e4d0 - @Ubuntu: - shell_prompt = "root@.{0,50}[\#\$] " + shell_prompt = "^root@.*[\#\$]\s*$" variants: - Ubuntu-6.10-32: @@ -285,7 +285,7 @@ variants: - RHEL: no setup - shell_prompt = "\[root@.{0,50}][\#\$] " + shell_prompt = "^\[.*\][\#\$]\s*$" variants: - 5.3.i386: @@ -348,7 +348,7 @@ variants: shutdown_command = shutdown /s /t 0 reboot_command = shutdown /r /t 0 status_test_command = echo %errorlevel% - shell_prompt = "C:\\.{0,50}>" + shell_prompt = "^\w:\\.*>\s*$" shell_client = nc shell_port = 22 # File transfers are currently unsupported