From owner-svn-src-head@freebsd.org  Sun Jun 28 21:33:09 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0ECA6356671;
 Sun, 28 Jun 2020 21:33:09 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49w3kr6dpCz3dYS;
 Sun, 28 Jun 2020 21:33:08 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C75EA1CC67;
 Sun, 28 Jun 2020 21:33:08 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05SLX8VP040022;
 Sun, 28 Jun 2020 21:33:08 GMT (envelope-from jilles@FreeBSD.org)
Received: (from jilles@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05SLX8rL040021;
 Sun, 28 Jun 2020 21:33:08 GMT (envelope-from jilles@FreeBSD.org)
Message-Id: <202006282133.05SLX8rL040021@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jilles set sender to
 jilles@FreeBSD.org using -f
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 28 Jun 2020 21:33:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r362738 - head/bin/sh/tests
X-SVN-Group: head
X-SVN-Commit-Author: jilles
X-SVN-Commit-Paths: head/bin/sh/tests
X-SVN-Commit-Revision: 362738
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2020 21:33:09 -0000

Author: jilles
Date: Sun Jun 28 21:33:08 2020
New Revision: 362738
URL: https://svnweb.freebsd.org/changeset/base/362738

Log:
  sh/tests: Re-enable bin.sh.execution.functional_test.bg12.0
  
  This reverts r362646.
  
  PR:		247559
  MFC after:	1 week

Modified:
  head/bin/sh/tests/functional_test.sh

Modified: head/bin/sh/tests/functional_test.sh
==============================================================================
--- head/bin/sh/tests/functional_test.sh	Sun Jun 28 21:15:29 2020	(r362737)
+++ head/bin/sh/tests/functional_test.sh	Sun Jun 28 21:33:08 2020	(r362738)
@@ -27,7 +27,6 @@
 # $FreeBSD$
 
 SRCDIR=$(atf_get_srcdir)
-CATEGORY=$(basename ${SRCDIR})
 
 check()
 {
@@ -61,20 +60,7 @@ add_testcase()
 	esac
 
 	atf_test_case ${tc_escaped}
-
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		case "${CATEGORY}/${tc}" in
-		execution/bg12.0)
-			eval "${tc_escaped}_body() { atf_skip 'https://bugs.freebsd.org/247559'; }"
-			;;
-		*)
-			eval "${tc_escaped}_body() { check ${tc}; }"
-			;;
-		esac
-	else
-		eval "${tc_escaped}_body() { check ${tc}; }"
-	fi
-
+	eval "${tc_escaped}_body() { check ${tc}; }"
 	atf_add_test_case ${tc_escaped}
 }