From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1014626-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 72E811382C5
	for <garchives@archives.gentoo.org>; Mon,  2 Apr 2018 18:37:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4477CE0BC3;
	Mon,  2 Apr 2018 18:37:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1D8E5E0BC3
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Apr 2018 18:37:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 0DDE7335DC4
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Apr 2018 18:37:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id DF9B5275
	for <gentoo-commits@lists.gentoo.org>; Mon,  2 Apr 2018 18:36:59 +0000 (UTC)
From: "Kristian Fiskerstrand" <k_f@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" <k_f@gentoo.org>
Message-ID: <1522694161.8f947b8fa11d7a4e5532702da94249dd88e0d27b.k_f@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cjs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: gnome-extra/cjs/cjs-3.6.1.ebuild
X-VCS-Directories: gnome-extra/cjs/
X-VCS-Committer: k_f
X-VCS-Committer-Name: Kristian Fiskerstrand
X-VCS-Revision: 8f947b8fa11d7a4e5532702da94249dd88e0d27b
X-VCS-Branch: master
Date: Mon,  2 Apr 2018 18:36:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 844bcc1a-8440-4b79-816f-263362e3d0af
X-Archives-Hash: 992eee09ca9d508acf9b160d3d5bdb66

commit:     8f947b8fa11d7a4e5532702da94249dd88e0d27b
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 17:20:59 2018 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 18:36:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f947b8f

gnome-extra/cjs: RESTRICT=test and fix a bunch of test failures

Fix a number of test failures related to console execution missing
compat symlink. Down to 2 remaining errors, but this test suite is flaky
enough and its not a reason to hold up the stabilization any longer so
adding a RESTRICT=test for now

Bug: https://bugs.gentoo.org/649534

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 gnome-extra/cjs/cjs-3.6.1.ebuild | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 23afc9055f7..d0ae7f565ac 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,9 +34,23 @@ RDEPEND="${RDEPEND}
 	!<gnome-extra/cinnamon-2.4
 "
 
+RESTRICT="test"
+
 src_prepare() {
 	eautoreconf
 	gnome2_src_prepare
+	sed -ie "s/gjs-console/cjs-console/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh \
+		"${S}"/installed-tests/scripts/testWarnings.sh || die
+
+	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
+		"${S}"/installed-tests/scripts/testCommandLine.sh || die
+
+	sed -ie "s/'Gjs'/'Cjs'/g" \
+		"${S}"/installed-tests/js/testExceptions.js \
+		"${S}"/installed-tests/js/testSignals.js \
+		"${S}"/installed-tests/js/testGDBus.js \
+		"${S}"/installed-tests/js/testEverythingBasic.js || die
 }
 
 src_configure() {