Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5357F10503 for ; Thu, 23 Jan 2014 11:07:26 +0000 (UTC) Received: (qmail 56533 invoked by uid 500); 23 Jan 2014 11:07:20 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 55633 invoked by uid 500); 23 Jan 2014 11:07:14 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 55619 invoked by uid 99); 23 Jan 2014 11:07:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jan 2014 11:07:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jan 2014 11:07:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8C97123888A6; Thu, 23 Jan 2014 11:06:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1560635 - in /sling/trunk/testing: samples/integration-tests/pom.xml tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Date: Thu, 23 Jan 2014 11:06:49 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140123110649.8C97123888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Thu Jan 23 11:06:49 2014 New Revision: 1560635 URL: http://svn.apache.org/r1560635 Log: SLING-3331 - accept a list of paths for additional bundles in SlingTestBase Modified: sling/trunk/testing/samples/integration-tests/pom.xml sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Modified: sling/trunk/testing/samples/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/samples/integration-tests/pom.xml?rev=1560635&r1=1560634&r2=1560635&view=diff ============================================================================== --- sling/trunk/testing/samples/integration-tests/pom.xml (original) +++ sling/trunk/testing/samples/integration-tests/pom.xml Thu Jan 23 11:06:49 2014 @@ -274,7 +274,7 @@ org.apache.sling org.apache.sling.testing.tools - 1.0.6 + 1.0.7-SNAPSHOT provided Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java?rev=1560635&r1=1560634&r2=1560635&view=diff ============================================================================== --- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java (original) +++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Thu Jan 23 11:06:49 2014 @@ -153,14 +153,19 @@ public class SlingTestBase { if(installBundlesFailed) { fail("Bundles could not be installed, cannot run tests"); } else if(!extraBundlesInstalled) { - final String path = System.getProperty(ADDITONAL_BUNDLES_PATH); - if(path == null) { + final String paths = System.getProperty(ADDITONAL_BUNDLES_PATH); + if(paths == null) { log.info("System property {} not set, additional bundles won't be installed", ADDITONAL_BUNDLES_PATH); } else { - final List toInstall = getBundlesToInstall(path); - + final List toInstall = new ArrayList(); try { + // Paths can contain a comma-separated list + final String [] allPaths = paths.split(","); + for(String path : allPaths) { + toInstall.addAll(getBundlesToInstall(path.trim())); + } + // Install bundles, check that they are installed and start them all bundlesInstaller.installBundles(toInstall, false); final List symbolicNames = new LinkedList();