From patchwork Tue Apr 2 19:58:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 15823 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 70E3023E00 for ; Tue, 2 Apr 2013 19:58:50 +0000 (UTC) Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by fiordland.canonical.com (Postfix) with ESMTP id 0A607A18971 for ; Tue, 2 Apr 2013 19:58:49 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id gf12sf1236045vcb.0 for ; Tue, 02 Apr 2013 12:58:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=WXBAZa6XfzIWpYHTrrDQnPMVdp0HPgmAafd0LSzmgBM=; b=ZzyTxd8G+WHcEzGF1YspUH+BA+KSq5YOJgroPsEPD7lhukdOVwv43onEqtc/b16TM2 xHCL9Hyi11QnPdfU28MqZSKQyYell+xYwg5HvRbmBbpo2WFU6rxB+ZKF2mqxwM/J9PN5 yPitpK6Xtfk7ggdFRfJGjApP61yjuHsO9xE0roWEZo2Y5RSu2t0QHXUrY2BoyRg32gvU yDv73+1cEzCsr3iB4AE5k1h+6OL30ZhW/n1G5HitveBkb255OUw9lz2KuO3cGNLwa7TE /YJtSoAPLJaRGwa9JG1YheAET3XsAKuf9uQaHHsXF6LQxSK8bA59yieci+CEYD1dK2IR yMmQ== X-Received: by 10.236.139.230 with SMTP id c66mr6787420yhj.55.1364932729408; Tue, 02 Apr 2013 12:58:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.60.5 with SMTP id d5ls583468qer.10.gmail; Tue, 02 Apr 2013 12:58:49 -0700 (PDT) X-Received: by 10.220.103.7 with SMTP id i7mr13892552vco.7.1364932729109; Tue, 02 Apr 2013 12:58:49 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id xa7si2414721vdc.35.2013.04.02.12.58.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 12:58:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id c13so1025968vea.11 for ; Tue, 02 Apr 2013 12:58:49 -0700 (PDT) X-Received: by 10.52.93.20 with SMTP id cq20mr11861458vdb.38.1364932728759; Tue, 02 Apr 2013 12:58:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp140792ved; Tue, 2 Apr 2013 12:58:48 -0700 (PDT) X-Received: by 10.236.44.39 with SMTP id m27mr16388917yhb.129.1364932727815; Tue, 02 Apr 2013 12:58:47 -0700 (PDT) Received: from mail-gh0-f174.google.com (mail-gh0-f174.google.com [209.85.160.174]) by mx.google.com with ESMTPS id 24si2637594yhj.231.2013.04.02.12.58.47 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 12:58:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.174 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=209.85.160.174; Received: by mail-gh0-f174.google.com with SMTP id g10so124799ghb.33 for ; Tue, 02 Apr 2013 12:58:47 -0700 (PDT) X-Received: by 10.236.24.170 with SMTP id x30mr16340892yhx.121.1364932727404; Tue, 02 Apr 2013 12:58:47 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id s16sm5141567yhj.13.2013.04.02.12.58.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 12:58:46 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/3] glsl_parser_test.py: For glsl 1.00 use gles2 Date: Tue, 2 Apr 2013 14:58:31 -0500 Message-Id: <1364932713-8221-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnqO2Tz0qyNlpmDNvcXc51QjiMoY2BN/p6vO1vgKa3Hd2z6vs1l0QL2TdYce/7tAyknIoEe X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , When the glsl_version is 1.00, use the glslparsertest_gles2 binary Signed-off-by: Tom Gall --- framework/glsl_parser_test.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/framework/glsl_parser_test.py b/framework/glsl_parser_test.py index 66e6dd3..914904d 100755 --- a/framework/glsl_parser_test.py +++ b/framework/glsl_parser_test.py @@ -368,8 +368,14 @@ class GLSLParserTest(PlainExecTest): return None assert(self.config is not None) + + if self.config.get('config', 'glsl_version') == '1.00': + runner = "glslparsertest_gles2" + else: + runner = "glslparsertest" + command = [ - path.join(testBinDir, 'glslparsertest'), + path.join(testBinDir, runner), self.__filepath, self.config.get('config', 'expect_result'), self.config.get('config', 'glsl_version')