From patchwork Sun Apr 21 06:09:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 16273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1AF324A1A for ; Sun, 21 Apr 2013 06:11:46 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id v20sf8355254qcm.5 for ; Sat, 20 Apr 2013 23:11:03 -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=DDmMSUKl0H9yqb4lhcPOzW4CMv74FiyiucezVdkCvKI=; b=TTRf6p9MNlN+3isxYVnH7n821cXsrB/UDoHMHCQwlEO8+a9SRA3syvelIPGGq7o6cr gQ4Oem0a+JFFPfBtB4+gB0/gNhM2/92SZpNscHrXVyj+WsfV0+5Zv7Wy6QHNVcfK7XL/ OOSBUh31PxvY8Uv6+9CJhCXb6tsxhgOnxqrf202tmYsx353ZRCsCV1JAHQv/4tYltTVe apjxaYtqK7TbXBbllmxin9vd/z6uorQJhgiaE5hv3M5lHOmrYfkKbRkHH7RTz19QFpFz ujVd5KBnJPGWwzOvAjN/0DDUvc9KiIsmweSQ6qceSLIM5uK2gt3vKCwHk8hCEhPomt2H jpzg== X-Received: by 10.224.10.6 with SMTP id n6mr12273760qan.4.1366524663041; Sat, 20 Apr 2013 23:11:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.25.138 with SMTP id c10ls2855788qeg.29.gmail; Sat, 20 Apr 2013 23:11:02 -0700 (PDT) X-Received: by 10.220.221.210 with SMTP id id18mr15697554vcb.74.1366524662682; Sat, 20 Apr 2013 23:11:02 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id ow6si13389332vcb.17.2013.04.20.23.11.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:11:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id ha11so734863vcb.2 for ; Sat, 20 Apr 2013 23:11:02 -0700 (PDT) X-Received: by 10.220.242.73 with SMTP id lh9mr15655416vcb.49.1366524662536; Sat, 20 Apr 2013 23:11:02 -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 nf2csp32074veb; Sat, 20 Apr 2013 23:11:02 -0700 (PDT) X-Received: by 10.50.30.104 with SMTP id r8mr5411051igh.9.1366524661796; Sat, 20 Apr 2013 23:11:01 -0700 (PDT) Received: from mail-ia0-x233.google.com (mail-ia0-x233.google.com [2607:f8b0:4001:c02::233]) by mx.google.com with ESMTPS id e9si22511553icx.90.2013.04.20.23.11.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:11:01 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::233 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::233; Received: by mail-ia0-f179.google.com with SMTP id p22so599569iad.38 for ; Sat, 20 Apr 2013 23:11:01 -0700 (PDT) X-Received: by 10.42.32.5 with SMTP id b5mr10657123icd.40.1366524661524; Sat, 20 Apr 2013 23:11:01 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPSA id d4sm10509992igc.3.2013.04.20.23.10.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:11:00 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 7/8] variable-index-write.sh: echo generated testcase name and formalize output directory target Date: Sun, 21 Apr 2013 01:09:42 -0500 Message-Id: <1366524583-25982-7-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: ALoCoQl6R2iVkX6NOzZH5jeeAjYGMQDhJQ/US6eIkLMxxR0w5TLWEwXuzwwfQsX/r3aBpDGZGJ3E X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 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: , Adjust shell script so it echos the name of the generated testcase and output the generated testcases using the following pattern: "spec/glsl"${es}-${version}"/execution/varible-index-write" This uses the convention followed by the other scripts that generate testcases. Signed-off-by: Tom Gall --- generated_tests/variable-index-write.sh | 98 +++++++++++++++++++------------ 1 file changed, 61 insertions(+), 37 deletions(-) diff --git a/generated_tests/variable-index-write.sh b/generated_tests/variable-index-write.sh index 06802c4..52cd24e 100755 --- a/generated_tests/variable-index-write.sh +++ b/generated_tests/variable-index-write.sh @@ -450,6 +450,14 @@ else esac fi +v=${version/./} +if [ $v -eq 100 ]; then + es="-es" +fi + +filepath="spec/glsl"${es}-${version}"/execution/varible-index-write" +mkdir -p ${filepath} + for mode in temp varying; do # More than 3 is unlikely to work for the varying tests due to using too # many varying vectors. mat4[3] uses 12 varying vectors by itself. @@ -465,57 +473,73 @@ for mode in temp varying; do for matrix_dim in 2 3 4; do # Fragment shaders cannot write varyings if [ "x$mode" != "xvarying" ]; then - emit_fs_wr_test $matrix_dim $array_dim $mode index col float \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode index 1 float \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test - - if [ $array_dim -ne 0 ]; then - emit_fs_wr_test $matrix_dim $array_dim $mode 1 col float \ - > fs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 float \ - > fs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test - - emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-wr.shader_test - fi + emit_fs_wr_test $matrix_dim $array_dim $mode index col float \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode index 1 float \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test" + + if [ $array_dim -ne 0 ]; then + emit_fs_wr_test $matrix_dim $array_dim $mode 1 col float \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 float \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test" + + emit_fs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-wr.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-wr.shader_test" + fi fi emit_vs_wr_test $matrix_dim $array_dim $mode index col float \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-wr.shader_test" emit_vs_wr_test $matrix_dim $array_dim $mode index 1 float \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-wr.shader_test" emit_vs_wr_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-wr.shader_test" emit_vs_wr_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}wr.shader_test" if [ $array_dim -ne 0 ]; then - emit_vs_wr_test $matrix_dim $array_dim $mode 1 col float \ - > vs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test + emit_vs_wr_test $matrix_dim $array_dim $mode 1 col float \ + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-row-wr.shader_test" - emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 float \ - > vs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test + emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 float \ + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-row-wr.shader_test" - emit_vs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test + emit_vs_wr_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-wr.shader_test" - emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-wr.shader_test + emit_vs_wr_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-wr.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-wr.shader_test" fi done done