From patchwork Sun Apr 21 06:09:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 16271 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6DE5524A1A for ; Sun, 21 Apr 2013 06:11:42 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q9sf1056100yen.0 for ; Sat, 20 Apr 2013 23:10:59 -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=MWVKlE1cJusJhjcx3RcOeh1vK5CA4iG/5rGp30RdTOc=; b=Hoyo9cvafeR8BYIjQnNPmyRz8HZX55bC7DVcbhX3UHArpxvT7/x+d80QmHxl/ai8qr 8xX+k/kW9jog9a1fkeVCSaamcETVAAVQwFaJfx+GbIe+gbuoTK/agkM6uWHW7VZTBMhi IzB+CUJmkRsZTNYma9MV+U3IqWXj7oB23Z5s4G/AfRoyisIVRY4U0plvcpVQMEhjf1Hy SM3AL+05tWasx1nkIWzWamOWDW3SlnNIXhO/GyVb8Y+wsvoQimc84yz2c0bkQfKORlK1 8e55JHBFdT02lUg50vdkxXrSB6AY8+FklURwEEHPZ+nZKbeFD0KyCWI8vsM20bIgMRLo SbFA== X-Received: by 10.224.185.17 with SMTP id cm17mr2050221qab.6.1366524658925; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.231 with SMTP id t7ls2764689qey.75.gmail; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) X-Received: by 10.52.66.176 with SMTP id g16mr13732880vdt.72.1366524658801; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id sx2si13395198vdc.19.2013.04.20.23.10.58 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id m17so473102vca.17 for ; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) X-Received: by 10.58.144.170 with SMTP id sn10mr11212948veb.7.1366524658656; Sat, 20 Apr 2013 23:10:58 -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 nf2csp32072veb; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) X-Received: by 10.50.56.236 with SMTP id d12mr5578268igq.92.1366524658037; Sat, 20 Apr 2013 23:10:58 -0700 (PDT) Received: from mail-ia0-x22e.google.com (mail-ia0-x22e.google.com [2607:f8b0:4001:c02::22e]) by mx.google.com with ESMTPS id e9si22554090icx.27.2013.04.20.23.10.57 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:58 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::22e is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::22e; Received: by mail-ia0-f174.google.com with SMTP id m10so2511156iam.5 for ; Sat, 20 Apr 2013 23:10:57 -0700 (PDT) X-Received: by 10.43.147.137 with SMTP id kc9mr3801045icc.9.1366524657682; Sat, 20 Apr 2013 23:10:57 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPSA id d4sm10509992igc.3.2013.04.20.23.10.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Apr 2013 23:10:56 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 5/8] Add calls to variable-index-read.sh and variable-index-write.sh in generated_tests Date: Sun, 21 Apr 2013 01:09:40 -0500 Message-Id: <1366524583-25982-5-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: ALoCoQnlm+SQ5OpO1cuOz72S/SctM6cVFIPgW9GIfFwiDi/LbvSR1Ef2LX5A3AQbHMxSKkpOhgI3 X-Original-Sender: tom.gall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 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: , In generated_tests/CMakeLists.txt add new fn piglit_make_sh_generated_tests which allows for shells scripts to be called to generate tests cases. Call variable-index-read.sh and variable-index-write.sh to generate tests for glsl 1.00, 1.10 and 1.20. Signed-off-by: Tom Gall --- generated_tests/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt index db3734f..c0950d1 100644 --- a/generated_tests/CMakeLists.txt +++ b/generated_tests/CMakeLists.txt @@ -18,6 +18,16 @@ function(piglit_make_generated_tests file_list generator_script) VERBATIM) endfunction(piglit_make_generated_tests custom_target generator_script) +function(piglit_make_sh_generated_tests file_list generator_sh_script version) + # Add a custom command which executes ${generator_script} + # during the build. + add_custom_command( + OUTPUT ${file_list} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${generator_sh_script} ${version} > ${file_list} + DEPENDS ${generator_sh_script} ${ARGN} + VERBATIM) +endfunction(piglit_make_sh_generated_tests custom_target generator_sh_script) + # Create custom commands and targets to build generated tests. piglit_make_generated_tests( builtin_packing_tests.list @@ -54,6 +64,24 @@ piglit_make_generated_tests( piglit_make_generated_tests( builtin_cl_int_tests.list generate-cl-int-builtins.py) +piglit_make_sh_generated_tests( + variable-index-read-100_tests.list + variable-index-read.sh 1.00) +piglit_make_sh_generated_tests( + variable-index-read-110_tests.list + variable-index-read.sh 1.10) +piglit_make_sh_generated_tests( + variable-index-read-120_tests.list + variable-index-read.sh 1.20) +piglit_make_sh_generated_tests( + variable-index-write-100_tests.list + variable-index-write.sh 1.00) +piglit_make_sh_generated_tests( + variable-index-write-110_tests.list + variable-index-write.sh 1.10) +piglit_make_sh_generated_tests( + variable-index-write-120_tests.list + variable-index-write.sh 1.20) # Add a "gen-tests" target that can be used to generate all the # tests without doing any other compilation. @@ -65,4 +93,10 @@ add_custom_target(gen-tests ALL interpolation_tests.list non-lvalue_tests.list texture_query_lod_tests.list - uniform-initializer_tests.list) + uniform-initializer_tests.list + variable-index-read-100_tests.list + variable-index-read-110_tests.list + variable-index-read-120_tests.list + variable-index-write-100_tests.list + variable-index-write-110_tests.list + variable-index-write-120_tests.list)