From patchwork Sun Apr 21 06:09:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 16272 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8B87724A1A for ; Sun, 21 Apr 2013 06:11:44 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id hf12sf10260894vcb.8 for ; Sat, 20 Apr 2013 23:11:01 -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=+6vAyQljWIsGNJwluEmHxeW2qHBdneO2yoNmhaG1gMk=; b=kwxI5Qx+HFhdBMplBr1WT9WBitL/66vNRhoLmQ0ymNzOpLbhFA8C5peRSaia8uuSqS lryIQLnj1pH74xXYvOwOFHZOqYZvyME5qV1UeB1bvot66N62wAUBupJp3Pzk1W0CyEOE mngf5h+ogJ3iWZkYcdK7+A3HT+e2trLO/NzusF37Z668sgq062svox0pwIo/KcOb9LcY nFoYJ3q0cFQJhngOHiaIxMZpOlmJbaCoFxhMIOM3Nl6yS4lIBZBNygvP/AHtkrSUBVVv UDcooTETZe9BNE7xgQ30YzhbsPYmZxxybbOZs2P4TX0x8dIjBxFXmUTwrqEKLM4RDURC xWuA== X-Received: by 10.224.10.6 with SMTP id n6mr12273687qan.4.1366524660888; Sat, 20 Apr 2013 23:11:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.130.74 with SMTP id oc10ls2813163qeb.53.gmail; Sat, 20 Apr 2013 23:11:00 -0700 (PDT) X-Received: by 10.58.80.4 with SMTP id n4mr15648863vex.5.1366524660766; Sat, 20 Apr 2013 23:11:00 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id a6si13360296vcx.84.2013.04.20.23.11.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:11:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 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.181; Received: by mail-vc0-f181.google.com with SMTP id ia10so5072627vcb.26 for ; Sat, 20 Apr 2013 23:11:00 -0700 (PDT) X-Received: by 10.52.228.71 with SMTP id sg7mr13081081vdc.51.1366524660628; Sat, 20 Apr 2013 23:11:00 -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 nf2csp32073veb; Sat, 20 Apr 2013 23:11:00 -0700 (PDT) X-Received: by 10.42.41.210 with SMTP id q18mr10808610ice.13.1366524659931; Sat, 20 Apr 2013 23:10:59 -0700 (PDT) Received: from mail-ie0-x22a.google.com (mail-ie0-x22a.google.com [2607:f8b0:4001:c03::22a]) by mx.google.com with ESMTPS id bb7si22511590icc.91.2013.04.20.23.10.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:59 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::22a is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::22a; Received: by mail-ie0-f170.google.com with SMTP id at1so2438901iec.15 for ; Sat, 20 Apr 2013 23:10:59 -0700 (PDT) X-Received: by 10.50.194.200 with SMTP id hy8mr12695989igc.3.1366524659601; Sat, 20 Apr 2013 23:10:59 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPSA id d4sm10509992igc.3.2013.04.20.23.10.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:58 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 6/8] variable-index-read.sh: echo generated testcase name and formalize output directory target Date: Sun, 21 Apr 2013 01:09:41 -0500 Message-Id: <1366524583-25982-6-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: ALoCoQmv3JHEnp4IGJDD6vd/VSdJ/OMVtK4HbO73oH4l22Fc03/ydhIClomtQEBMHBawDOgTTrkR X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 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-read" This uses the convention followed by the other scripts that generate testcases. Signed-off-by: Tom Gall --- generated_tests/variable-index-read.sh | 57 +++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/generated_tests/variable-index-read.sh b/generated_tests/variable-index-read.sh index 8fa2bc7..1dd821a 100755 --- a/generated_tests/variable-index-read.sh +++ b/generated_tests/variable-index-read.sh @@ -458,6 +458,14 @@ else esac fi +v=${version/./} +if [ $v -eq 100 ]; then + es="-es" +fi + +filepath="spec/glsl"${es}-${version}"/execution/varible-index-read" +mkdir -p ${filepath} + for mode in temp uniform 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. @@ -468,56 +476,73 @@ for mode in temp uniform varying; do idx_txt="index-" emit_fs_rd_test $matrix_dim $array_dim $mode 1 col float \ - > fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 float \ - > fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode 1 col float \ - > vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-row-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 float \ - > vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-row-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode 1 col vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-col-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode 1 1 vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-rd.shader_test" + else arr="" idx_txt="" fi emit_fs_rd_test $matrix_dim $array_dim $mode index col float \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode index 1 float \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test" emit_fs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test + > ${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test + echo "${filepath}/fs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode index col float \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-row-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode index 1 float \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}row-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode index col vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}col-rd.shader_test" emit_vs_rd_test $matrix_dim $array_dim $mode index 1 vec${matrix_dim} \ - > vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test + > ${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test + echo "${filepath}/vs-${mode}-${arr}mat${matrix_dim}-${idx_txt}rd.shader_test" done done done