You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/11/22 17:34:40 UTC

svn commit: r1770862 - in /sling/trunk/installer/it: pom.xml src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java

Author: bdelacretaz
Date: Tue Nov 22 17:34:40 2016
New Revision: 1770862

URL: http://svn.apache.org/viewvc?rev=1770862&view=rev
Log:
Allow for debugging the pax exam tests, via -Dpax.vm.options

Modified:
    sling/trunk/installer/it/pom.xml
    sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java

Modified: sling/trunk/installer/it/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=1770862&r1=1770861&r2=1770862&view=diff
==============================================================================
--- sling/trunk/installer/it/pom.xml (original)
+++ sling/trunk/installer/it/pom.xml Tue Nov 22 17:34:40 2016
@@ -36,7 +36,10 @@
         <exam.version>3.0.3</exam.version>
         <url.version>2.4.7</url.version>
         <pax.exam.log.level>INFO</pax.exam.log.level>
+        <pax.vm.options>-Xmx256M -XX:MaxPermSize=256m</pax.vm.options>
         <installer.configuration.version>1.1.3-SNAPSHOT</installer.configuration.version>
+        
+        <argLine>${pax.vm.options}</argLine>
 
         <!-- BundleInstallStressTest parameters -->
         <BundleInstallStressTest.default.bundles.folder>${project.build.directory}/bundle-install-stress-test-bundles</BundleInstallStressTest.default.bundles.folder>
@@ -74,6 +77,10 @@
                             <value>${pax.exam.log.level}</value>
                         </property>
                         <property>
+                            <name>pax.exam.debug.port</name>
+                            <value>${pax.exam.debug.port}</value>
+                        </property>
+                        <property>
                             <name>osgi.installer.pom.version</name>
                             <value>${project.version}</value>
                         </property>

Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1770862&r1=1770861&r2=1770862&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Nov 22 17:34:40 2016
@@ -494,10 +494,6 @@ public class OsgiInstallerTestBase imple
 
     	// optional debugging
     	final String paxDebugLevel = System.getProperty("pax.exam.log.level", "INFO");
-    	final String paxDebugPort = System.getProperty("pax.exam.debug.port");
-    	if(paxDebugPort != null && paxDebugPort.length() > 0) {
-        	vmOpt += " -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=" + paxDebugPort;
-    	}
 
     	String localRepo = System.getProperty("maven.repo.local", "");