From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E96A413800E for ; Fri, 27 Jul 2012 16:10:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7375DE0458; Fri, 27 Jul 2012 16:09:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3A343E0458 for ; Fri, 27 Jul 2012 16:09:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A18771B405E for ; Fri, 27 Jul 2012 16:09:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6424FE5436 for ; Fri, 27 Jul 2012 16:09:02 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1333565752.32d263b1b2e11caf7003b7f50eab1e4fe971b6b5.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 32d263b1b2e11caf7003b7f50eab1e4fe971b6b5 X-VCS-Branch: master Date: Fri, 27 Jul 2012 16:09:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 66782958-85f9-4661-ba7c-4c11cfccbab8 X-Archives-Hash: 7a2d91cc6b4cc527187ad6df912128dc commit: 32d263b1b2e11caf7003b7f50eab1e4fe971b6b5 Author: Brian Evans lavabit com> AuthorDate: Wed Apr 4 18:55:52 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Apr 4 18:55:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=32d263b1 Missed one typo from disable test fix --- eclass/mysql-cmake.eclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 7b79d91..d625eec 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -37,7 +37,7 @@ mysql-cmake_disable_test() { #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" echo ${testname} : ${reason} >> "${mysql_disable_file}" - if [ -n "${testsuite}" ]; then + if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then for mysql_disabled_file in \ ${S}/mysql-test/suite/${testsuite}/disabled.def \ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ @@ -45,7 +45,7 @@ mysql-cmake_disable_test() { [ -f "${mysql_disabled_file}" ] && break done if [ "${mysql_disabled_file}" != "FAILED" ]; then - echo "${testname} : ${reason}" >> "${mysql_disable_file}" + echo "${testname} : ${reason}" >> "${mysql_disabled_file}" else for mysql_disabled_dir in \ ${S}/mysql-test/suite/${testsuite} \