From patchwork Thu Jun 18 09:06:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Timothy Arceri' via Patchwork Forward X-Patchwork-Id: 50000 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 596C1228CC for ; Thu, 18 Jun 2015 09:06:53 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf18884130lbb.0 for ; Thu, 18 Jun 2015 02:06:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:reply-to; bh=YZTZAAzYSwCsdwEVvZLRuvPEBNw//3yu/9c1e39y85w=; b=KyaaO96a5Pee44hbX24Zecw08ySKZXHIaUbVIm5dXCD30+kbxWyCs/dXSgbqgJsopI idFIl6i1uRksUhXMXOk1BMmXJWJEP+vTBKkkURmwJtQhAihNL+1pmCIQP9OVmRWW1iTg hi3BnZfR4+En9JPd8wUzbrOsnBmFxSRc8h0KAetJQ8cF1uFstMWiN+uvoAUleo3VDHJk ftawS8eV/9i0JhuF+sTNwocVYWNUFXLz/CPIvLWIyy5qRohdhPgG82V2dL1QJkrFc2ET n6r7zvK5JoETNRYnd1VwwGr2gTvT6+1/bCeTV4kQvShgiPnklHorT1EeV7ZNOkBP3pqf 8a1Q== X-Gm-Message-State: ALoCoQlKt4cdIcbtCLsldUcCtb3s2qYoe8FB3DEib9TH42ZNH6bJC+4/Cp9LldU0wHLePeW/7AH3 X-Received: by 10.112.162.228 with SMTP id yd4mr9405961lbb.8.1434618412277; Thu, 18 Jun 2015 02:06:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.174 with SMTP id p14ls363474lal.68.gmail; Thu, 18 Jun 2015 02:06:52 -0700 (PDT) X-Received: by 10.153.4.40 with SMTP id cb8mr11917057lad.105.1434618412094; Thu, 18 Jun 2015 02:06:52 -0700 (PDT) Received: from mail-la0-x231.google.com (mail-la0-x231.google.com. [2a00:1450:4010:c03::231]) by mx.google.com with ESMTPS id bx11si5968177lbb.141.2015.06.18.02.06.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 02:06:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::231 as permitted sender) client-ip=2a00:1450:4010:c03::231; Received: by lacny3 with SMTP id ny3so50278747lac.3 for ; Thu, 18 Jun 2015 02:06:52 -0700 (PDT) X-Received: by 10.152.179.234 with SMTP id dj10mr5444624lac.73.1434618411943; Thu, 18 Jun 2015 02:06:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1036672lbb; Thu, 18 Jun 2015 02:06:50 -0700 (PDT) X-Received: by 10.70.133.170 with SMTP id pd10mr19350576pdb.127.1434618410136; Thu, 18 Jun 2015 02:06:50 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id tb2si10512842pab.75.2015.06.18.02.06.49; Thu, 18 Jun 2015 02:06:50 -0700 (PDT) Received-SPF: pass (google.com: domain of piglit-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 153CA6E055; Thu, 18 Jun 2015 02:06:49 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm27-vm8.bullet.mail.gq1.yahoo.com (nm27-vm8.bullet.mail.gq1.yahoo.com [98.136.216.151]) by gabe.freedesktop.org (Postfix) with ESMTP id A5B536E055 for ; Thu, 18 Jun 2015 02:06:48 -0700 (PDT) Received: from [98.137.12.59] by nm27.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 09:06:48 -0000 Received: from [208.71.42.194] by tm4.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 09:06:48 -0000 Received: from [127.0.0.1] by smtp205.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 09:06:48 -0000 X-Yahoo-Newman-Id: 200418.77510.bm@smtp205.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: My7p9IwVM1kRWXyLgiPnuCJHZukS1gqzV8sx4yn91qluHtv wSAbaZtR2Y_xW05hnfYUkThtT8kuufDFA4TWHQF6vTvpSZQ51vxA2vq14PJf Fou39kVV01ZZIJDvJ_iShuKzYZSQFie0tNuTiqGtE2HRassxeXgdpcSFAniy HwSIPMd5bAEof0gwIGp5_j2iHfzVef9Yqcx9MGtSIqaLXOqYByWF1g3g2u9E ZleqicDdP7D3IO3ZYNFmAZ20.azfnQp2yOeTEj3jgDMVqvH5kmHt7kfVhJWg 6JLu30xzRiajxkLx18kXNyKdy4NDx3Nd7Q6vOF4ByKLX6kxomJOOX7pHd1Pa A_IdhGsG204CP2nFA.XJRrQaaSjpvJlMvez2NU8XvJr3FmNRsbxrfhKlrjUs VqU6iw6eJJSOVgh3gxR2gzc2UDit8I8pRQhUnAS9eXVGAUe6VbYOPe6dN_cP lFANQyXWgmOHU5BU2HH.cUsY.TosIAqBWWHmfVMqD.9p2lOWfsMGis439edV dZuhkFLiVu64htYyx13ucqdReWOUiX4tLu_Q- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Thu, 18 Jun 2015 19:06:38 +1000 Message-Id: <1434618398-30891-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.1.0 Subject: [Piglit] [PATCH] khr-debug: fix broken label test X-BeenThere: piglit@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: piglit-bounces@lists.freedesktop.org Sender: "Piglit" X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::231 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@yahoo.com.au; dmarc=fail (p=NONE dis=NONE) header.from=yahoo.com.au Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 X-Original-From: Timothy Arceri Reply-To: Timothy Arceri --- tests/spec/khr_debug/debug-object-label.c | 36 ++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/spec/khr_debug/debug-object-label.c b/tests/spec/khr_debug/debug-object-label.c index 151e684..ad4c9fc 100644 --- a/tests/spec/khr_debug/debug-object-label.c +++ b/tests/spec/khr_debug/debug-object-label.c @@ -158,7 +158,8 @@ test_object_label_types() ObjectLabel(GL_BUFFER, buffer, -1, TestLabel); GetObjectLabel(GL_BUFFER, buffer, TestLabelLen + 1, &length[BUFFER_IDX], label[BUFFER_IDX]); - check_label_and_length(label[BUFFER_IDX], length[BUFFER_IDX], "GL_BUFFER"); + pass = check_label_and_length(label[BUFFER_IDX], length[BUFFER_IDX], + "GL_BUFFER") && pass; glDeleteBuffers(1, &buffer); @@ -169,7 +170,8 @@ test_object_label_types() GetObjectLabel(GL_SHADER, shader, TestLabelLen + 1, &length[SHADER_IDX], label[SHADER_IDX]); - check_label_and_length(label[SHADER_IDX], length[SHADER_IDX], "GL_SHADER"); + pass = check_label_and_length(label[SHADER_IDX], length[SHADER_IDX], + "GL_SHADER") && pass; glDeleteShader(shader); @@ -179,7 +181,8 @@ test_object_label_types() GetObjectLabel(GL_PROGRAM, program, TestLabelLen + 1, &length[PROGRAM_IDX], label[PROGRAM_IDX]); - check_label_and_length(label[PROGRAM_IDX], length[PROGRAM_IDX], "GL_PROGRAM"); + pass = check_label_and_length(label[PROGRAM_IDX], length[PROGRAM_IDX], + "GL_PROGRAM") && pass; glDeleteProgram(program); } @@ -193,7 +196,8 @@ test_object_label_types() GetObjectLabel(GL_VERTEX_ARRAY, vertexArray, TestLabelLen + 1, &length[VERTEX_ARRAY_IDX], label[VERTEX_ARRAY_IDX]); - check_label_and_length(label[VERTEX_ARRAY_IDX], length[VERTEX_ARRAY_IDX], "GL_VERTEX_ARRAY"); + pass = check_label_and_length(label[VERTEX_ARRAY_IDX], length[VERTEX_ARRAY_IDX], + "GL_VERTEX_ARRAY") && pass; glDeleteVertexArrays(1, &vertexArray); } @@ -207,7 +211,8 @@ test_object_label_types() GetObjectLabel(GL_RENDERBUFFER, renderbuffer, TestLabelLen + 1, &length[RENDERBUFFER_IDX], label[RENDERBUFFER_IDX]); - check_label_and_length(label[RENDERBUFFER_IDX], length[RENDERBUFFER_IDX], "GL_RENDERBUFFER"); + pass = check_label_and_length(label[RENDERBUFFER_IDX], length[RENDERBUFFER_IDX], + "GL_RENDERBUFFER") && pass; glDeleteRenderbuffers(1, &renderbuffer); @@ -218,7 +223,8 @@ test_object_label_types() GetObjectLabel(GL_FRAMEBUFFER, framebuffer, TestLabelLen + 1, &length[FRAMEBUFFER_IDX], label[FRAMEBUFFER_IDX]); - check_label_and_length(label[FRAMEBUFFER_IDX], length[FRAMEBUFFER_IDX], "GL_FRAMEBUFFER"); + pass = check_label_and_length(label[FRAMEBUFFER_IDX], length[FRAMEBUFFER_IDX], + "GL_FRAMEBUFFER") && pass; glDeleteFramebuffers(1, &framebuffer); } @@ -232,7 +238,8 @@ test_object_label_types() ObjectLabel(GL_QUERY, query, -1, TestLabel); GetObjectLabel(GL_QUERY, query, TestLabelLen + 1, &length[QUERY_IDX], label[QUERY_IDX]); - check_label_and_length(label[QUERY_IDX], length[QUERY_IDX], "GL_TEST_QUERY"); + pass = check_label_and_length(label[QUERY_IDX], length[QUERY_IDX], + "GL_TEST_QUERY") && pass; glDeleteQueries(1, &query); } @@ -246,7 +253,8 @@ test_object_label_types() GetObjectLabel(GL_PROGRAM_PIPELINE, programPipeline, TestLabelLen + 1, &length[PROGRAM_PIPELINE_IDX], label[PROGRAM_PIPELINE_IDX]); - check_label_and_length(label[PROGRAM_PIPELINE_IDX], length[PROGRAM_PIPELINE_IDX], "GL_PROGRAM_PIPELINE"); + pass = check_label_and_length(label[PROGRAM_PIPELINE_IDX], length[PROGRAM_PIPELINE_IDX], + "GL_PROGRAM_PIPELINE") && pass; glDeleteProgramPipelines(1, &programPipeline); } @@ -261,7 +269,8 @@ test_object_label_types() GetObjectLabel(GL_TRANSFORM_FEEDBACK, transformFeedback, TestLabelLen + 1, &length[TRANSFORM_FEEDBACK_IDX], label[TRANSFORM_FEEDBACK_IDX]); - check_label_and_length(label[TRANSFORM_FEEDBACK_IDX], length[TRANSFORM_FEEDBACK_IDX], "GL_TRANSFORM_FEEDBACK"); + pass = check_label_and_length(label[TRANSFORM_FEEDBACK_IDX], length[TRANSFORM_FEEDBACK_IDX], + "GL_TRANSFORM_FEEDBACK") && pass; glDeleteTransformFeedbacks(1, &transformFeedback); } @@ -274,7 +283,8 @@ test_object_label_types() ObjectLabel(GL_SAMPLER, sampler, -1, TestLabel); GetObjectLabel(GL_SAMPLER, sampler, TestLabelLen + 1, &length[SAMPLER_IDX], label[SAMPLER_IDX]); - check_label_and_length(label[SAMPLER_IDX], length[SAMPLER_IDX], "GL_SAMPLER"); + pass = check_label_and_length(label[SAMPLER_IDX], length[SAMPLER_IDX], + "GL_SAMPLER") && pass; glDeleteSamplers(1, &sampler); } @@ -285,7 +295,8 @@ test_object_label_types() ObjectLabel(GL_TEXTURE, texture, -1, TestLabel); GetObjectLabel(GL_TEXTURE, texture, TestLabelLen + 1, &length[TEXTURE_IDX], label[TEXTURE_IDX]); - check_label_and_length(label[TEXTURE_IDX], length[TEXTURE_IDX], "GL_TEXTURE"); + pass = check_label_and_length(label[TEXTURE_IDX], length[TEXTURE_IDX], + "GL_TEXTURE") && pass; glDeleteTextures(1, &texture); @@ -297,7 +308,8 @@ test_object_label_types() ObjectLabel(GL_DISPLAY_LIST, displayList, -1, TestLabel); GetObjectLabel(GL_DISPLAY_LIST, displayList, TestLabelLen + 1, &length[DISPLAY_LIST_IDX], label[DISPLAY_LIST_IDX]); - check_label_and_length(label[DISPLAY_LIST_IDX], length[DISPLAY_LIST_IDX], "GL_DISPLAY_LIST"); + pass = check_label_and_length(label[DISPLAY_LIST_IDX], length[DISPLAY_LIST_IDX], + "GL_DISPLAY_LIST") && pass; glDeleteLists(displayList, 1); #endif /* PIGLIT_USE_OPENGL */