Browse files

ISPN-2597 Make build work within 64 bit envs with limited resources

* Disable Cassandra and HBase modules whose testsuites consume
far too many resources. They should be able to work within same
JVM as the build to keep resource consumption reasonable.
* Scala compiler memory has been increased and in 64 bit
environments it uses compressed OOPs.
* Switch lucene demo testsuite so that it never forks.
* Definte transport protocol at root properties, otherwise when
using plattform specific build options (32 bit vs 64 bit), the
property is resolved too late and results in test failures.
  • Loading branch information...
1 parent 77c809e commit a03d7fec7afa13b4f7ee27e08de97ce1d28ee02c @galderz galderz committed with tristantarrant Dec 10, 2012
Showing with 107 additions and 37 deletions.
  1. +3 −1 cachestore/hbase/pom.xml
  2. +1 −1 demos/lucene-directory-demo/pom.xml
  3. +101 −33 parent/pom.xml
  4. +2 −2 pom.xml
View
4 cachestore/hbase/pom.xml
@@ -77,7 +77,9 @@
<configuration>
<forkMode>pertest</forkMode>
<parallel>false</parallel>
- <argLine>-XX:+UseCompressedOops</argLine>
+ <!--
+ <argLine>-Xmx256m</argLine>
+ -->
</configuration>
</plugin>
<plugin>
View
2 demos/lucene-directory-demo/pom.xml
@@ -75,7 +75,7 @@
<configuration>
<parallel>false</parallel>
<threadCount>1</threadCount>
- <forkMode>once</forkMode>
+ <forkMode>never</forkMode>
<systemProperties>
<property>
<name>jgroups.bind_addr</name>
View
134 parent/pom.xml
@@ -100,6 +100,7 @@
<defaultTestGroup>functional,unit,arquillian</defaultTestGroup>
<testNGListener>org.infinispan.test.fwk.UnitTestTestNGListener</testNGListener>
<infinispan.test.parallel.threads>20</infinispan.test.parallel.threads>
+ <infinispan.test.jgroups.protocol>tcp</infinispan.test.jgroups.protocol>
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
<packaging>jar</packaging>
@@ -1243,39 +1244,6 @@
<version>8.0.0.M3</version>
</plugin>
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-compile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <scalaVersion>${version.scala}</scalaVersion>
- <jvmArgs>
- <jvmArg>-XX:+UseCompressedOops</jvmArg>
- </jvmArgs>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${version.jacoco}</version>
@@ -1908,5 +1876,105 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>32bitstuff</id>
+ <activation>
+ <property>
+ <name>sun.arch.data.model</name>
+ <value>32</value>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <scalaVersion>${version.scala}</scalaVersion>
+ <jvmArgs>
+ <jvmArg>-Xmx256m</jvmArg>
+ </jvmArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
+ <profile>
+ <id>64bitstuff</id>
+ <activation>
+ <property>
+ <name>sun.arch.data.model</name>
+ <value>64</value>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>2.15.2</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <scalaVersion>${version.scala}</scalaVersion>
+ <jvmArgs>
+ <jvmArg>-Xmx256m</jvmArg>
+ <jvmArg>-XX:+UseCompressedOops</jvmArg>
+ </jvmArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+
</profiles>
</project>
View
4 pom.xml
@@ -53,8 +53,8 @@
<module>cachestore/bdbje</module>
<module>cachestore/cloud</module>
<module>cachestore/remote</module>
- <module>cachestore/cassandra</module>
- <module>cachestore/hbase</module>
+ <!--<module>cachestore/cassandra</module>-->
+ <!--<module>cachestore/hbase</module>-->
<module>server</module>
<module>server/core</module>
<module>server/memcached</module>

0 comments on commit a03d7fe

Please sign in to comment.