From patchwork Sun Apr 21 06:09:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 16270 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1B65524A1A for ; Sun, 21 Apr 2013 06:11:40 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id m6sf2769719wiv.11 for ; Sat, 20 Apr 2013 23:10:56 -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 :in-reply-to:references: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=CvuKozmyLZa9KhSzpEio3UIxWSjOeShI/8f9S6xItcEVrOd7dqRe/gAzyfwZqKcrnt Vuozvx274Wnfe2v6DqY9WRA3LjYmcMaxzw86eCExw25ySRce07q416rCriP91GLWznt1 m4kCfhnidXle4UbMt6HwXABwuKHvMH0WtlATxuonhiQCoQEHjfCkuNJQqmXWqfHpiVIJ Vx9zaYVNar5lIXRUUKpPqKnUtVz9OyvSxPMWSc6YfQ5x/5SpzZ5DfHftV7KvSmNtgcbN sRyNOjqjvMicJ0epC82KJntWsHqk5IuPIMCcx93HskUfpNQTVoyqUKGuUwbJUXC7KCrT XQow== X-Received: by 10.180.92.202 with SMTP id co10mr5843971wib.1.1366524655983; Sat, 20 Apr 2013 23:10:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.184.105 with SMTP id et9ls603931wic.46.canary; Sat, 20 Apr 2013 23:10:55 -0700 (PDT) X-Received: by 10.194.173.167 with SMTP id bl7mr40357851wjc.50.1366524655900; Sat, 20 Apr 2013 23:10:55 -0700 (PDT) Received: from mail-ve0-x22a.google.com (mail-ve0-x22a.google.com [2607:f8b0:400c:c01::22a]) by mx.google.com with ESMTPS id dq3si3192602wib.59.2013.04.20.23.10.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:55 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22a is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::22a; Received: by mail-ve0-f170.google.com with SMTP id 15so315143vea.15 for ; Sat, 20 Apr 2013 23:10:54 -0700 (PDT) X-Received: by 10.52.166.103 with SMTP id zf7mr13525602vdb.94.1366524654816; Sat, 20 Apr 2013 23:10:54 -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.58.127.98 with SMTP id nf2csp32069veb; Sat, 20 Apr 2013 23:10:54 -0700 (PDT) X-Received: by 10.50.29.51 with SMTP id g19mr12820061igh.104.1366524654251; Sat, 20 Apr 2013 23:10:54 -0700 (PDT) Received: from mail-ia0-x230.google.com (mail-ia0-x230.google.com [2607:f8b0:4001:c02::230]) by mx.google.com with ESMTPS id l4si9119122igk.8.2013.04.20.23.10.54 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:54 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::230 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::230; Received: by mail-ia0-f176.google.com with SMTP id i9so4424814iad.7 for ; Sat, 20 Apr 2013 23:10:54 -0700 (PDT) X-Received: by 10.50.114.10 with SMTP id jc10mr18508460igb.61.1366524653995; Sat, 20 Apr 2013 23:10:53 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPSA id d4sm10509992igc.3.2013.04.20.23.10.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:53 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 3/8] glsl_parser_test.py: For glsl 1.00 use correct glslparsertest_gles2 binary Date: Sun, 21 Apr 2013 01:09:38 -0500 Message-Id: <1366524583-25982-3-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366524583-25982-1-git-send-email-tom.gall@linaro.org> References: <1366524583-25982-1-git-send-email-tom.gall@linaro.org> X-Gm-Message-State: ALoCoQn9sZPiv33FwcKw0N92XH69wNkVohOOJsALtLqotfizpf/sI4CL5edmUhkBSuxUNbOK9JTi X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22a 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')