Skip to content

Commit 48984f3

Browse files
juliandolbyjuliandolby
committed
travis stuff
1 parent b4c05f8 commit 48984f3

File tree

14 files changed

+363
-51
lines changed

14 files changed

+363
-51
lines changed

‎.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: java
2+
jdk: oraclejdk8
3+
before_install:
4+
- git clone --depth=50 https://github.com/wala/WALA /tmp/WALA
5+
install:
6+
- pushd /tmp/WALA
7+
- mvn clean install -DskipTests -B -q
8+
- popd
9+
script:
10+
- mvn clean install
11+
sudo: false
12+
cache:
13+
directories:
14+
- $HOME/.m2

‎com.ibm.wala.memsat.jdt.test/source/test/angelic/JdtAngelicTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*****************************************************************************/
1111
package test.angelic;
1212

13+
import java.io.IOException;
14+
1315
import org.eclipse.core.runtime.NullProgressMonitor;
1416
import org.junit.AfterClass;
1517
import org.junit.BeforeClass;
@@ -29,7 +31,7 @@ protected Options getOptions() {
2931
}
3032

3133
@BeforeClass
32-
public static void beforeClass() {
34+
public static void beforeClass() throws IOException {
3335
EclipseTestUtil.importZippedProject(MiniaturTestsPlugin.getDefault(), JdtTestUtil.PROJECT_NAME, JdtTestUtil.PROJECT_ZIP, new NullProgressMonitor());
3436
}
3537

‎com.ibm.wala.memsat.jdt.test/source/test/sequential/JdtMiniaturTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*****************************************************************************/
1111
package test.sequential;
1212

13+
import java.io.IOException;
14+
1315
import org.eclipse.core.runtime.NullProgressMonitor;
1416
import org.junit.AfterClass;
1517
import org.junit.BeforeClass;
@@ -29,7 +31,7 @@ protected Options getOptions() {
2931
}
3032

3133
@BeforeClass
32-
public static void beforeClass() {
34+
public static void beforeClass() throws IOException {
3335
EclipseTestUtil.importZippedProject(MiniaturTestsPlugin.getDefault(), JdtTestUtil.PROJECT_NAME, JdtTestUtil.PROJECT_ZIP, new NullProgressMonitor());
3436
}
3537

‎com.ibm.wala.memsat.jdt.test/source/tests/causality/JdtJMMAltCausalityTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*****************************************************************************/
1111
package tests.causality;
1212

13+
import java.io.IOException;
1314
import java.util.Set;
1415

1516
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -34,7 +35,7 @@ protected Options getOptions(int maxSpeculations, Set<MethodReference> special)
3435
}
3536

3637
@BeforeClass
37-
public static void beforeClass() {
38+
public static void beforeClass() throws IOException {
3839
EclipseTestUtil.importZippedProject(MiniaturTestsPlugin.getDefault(), JdtTestUtil.PROJECT_NAME, JdtTestUtil.PROJECT_ZIP, new NullProgressMonitor());
3940
}
4041

‎com.ibm.wala.memsat.jdt.test/source/tests/causality/JdtJMMOriginalCausalityTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*****************************************************************************/
1111
package tests.causality;
1212

13+
import java.io.IOException;
1314
import java.util.Set;
1415

1516
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -34,7 +35,7 @@ protected Options getOptions(int maxSpeculations, Set<MethodReference> special)
3435
}
3536

3637
@BeforeClass
37-
public static void beforeClass() {
38+
public static void beforeClass() throws IOException {
3839
EclipseTestUtil.importZippedProject(MiniaturTestsPlugin.getDefault(), JdtTestUtil.PROJECT_NAME, JdtTestUtil.PROJECT_ZIP, new NullProgressMonitor());
3940
}
4041

‎com.ibm.wala.memsat.test/pom.xml

Lines changed: 150 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,167 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
42
<modelVersion>4.0.0</modelVersion>
5-
<parent>
6-
<artifactId>WALA</artifactId>
7-
<groupId>com.ibm.wala</groupId>
8-
<version>1.3.10-SNAPSHOT</version>
9-
</parent>
3+
<groupId>com.ibm.wala</groupId>
104
<artifactId>com.ibm.wala.memsat.test</artifactId>
11-
<packaging>eclipse-plugin</packaging>
12-
<version>1.0.0-SNAPSHOT</version>
5+
<version>0.0.1-SNAPSHOT</version>
6+
<name>com.ibm.wala.memsat.test</name>
7+
<description>MemSAT tests</description>
138
<build>
9+
<testSourceDirectory>src</testSourceDirectory>
10+
<resources>
11+
<resource>
12+
<directory>testdata</directory>
13+
</resource>
14+
</resources>
1415
<plugins>
16+
<plugin>
17+
<artifactId>maven-compiler-plugin</artifactId>
18+
<version>3.1</version>
19+
<configuration>
20+
<source>1.8</source>
21+
<target>1.8</target>
22+
</configuration>
23+
</plugin>
1524
<plugin>
1625
<groupId>org.apache.maven.plugins</groupId>
1726
<artifactId>maven-surefire-plugin</artifactId>
18-
<executions>
19-
<execution>
20-
<id>test</id>
21-
<phase>test</phase>
22-
<configuration>
23-
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
24-
<argLine>-Djava.library.path=${project.build.outputDirectory}/jni/darwin_x86_64 -ea</argLine>
25-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
26-
</configuration>
27-
<goals>
28-
<goal>test</goal>
29-
</goals>
30-
</execution>
31-
</executions>
27+
<version>2.20</version>
28+
<configuration>
29+
<forkMode>once</forkMode>
30+
<argLine>-Djava.library.path=${basedir}/../com.ibm.wala.memsat/jni/darwin_x86_64: ${basedir}/../com.ibm.wala.memsat/jni/linux_x86_64</argLine>
31+
<workingDirectory>${basedir}/../com.ibm.wala.memsat.testdata</workingDirectory>
32+
<includes>
33+
<include>**/*Tests.java</include>
34+
</includes>
35+
</configuration>
3236
</plugin>
3337
</plugins>
38+
<pluginManagement>
39+
<plugins>
40+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
41+
<plugin>
42+
<groupId>org.eclipse.m2e</groupId>
43+
<artifactId>lifecycle-mapping</artifactId>
44+
<version>1.0.0</version>
45+
<configuration>
46+
<lifecycleMappingMetadata>
47+
<pluginExecutions>
48+
<pluginExecution>
49+
<pluginExecutionFilter>
50+
<groupId>
51+
org.apache.maven.plugins
52+
</groupId>
53+
<artifactId>
54+
maven-antrun-plugin
55+
</artifactId>
56+
<versionRange>[1.8,)</versionRange>
57+
<goals>
58+
<goal>run</goal>
59+
</goals>
60+
</pluginExecutionFilter>
61+
<action>
62+
<ignore></ignore>
63+
</action>
64+
</pluginExecution>
65+
</pluginExecutions>
66+
</lifecycleMappingMetadata>
67+
</configuration>
68+
</plugin>
69+
</plugins>
70+
</pluginManagement>
3471
</build>
3572
<dependencies>
73+
<dependency>
74+
<groupId>kodkod</groupId>
75+
<artifactId>kodkod</artifactId>
76+
<version>2.0</version>
77+
<scope>system</scope>
78+
<systemPath>${project.basedir}/../com.ibm.wala.memsat/lib/kodkod.jar</systemPath>
79+
</dependency>
80+
<dependency>
81+
<groupId>com.ibm.wala</groupId>
82+
<artifactId>com.ibm.wala.memsat</artifactId>
83+
<version>0.0.1-SNAPSHOT</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>com.ibm.wala</groupId>
87+
<artifactId>com.ibm.wala.memsat.testdata</artifactId>
88+
<version>0.0.1-SNAPSHOT</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.ibm.wala</groupId>
92+
<artifactId>com.ibm.wala.cast.js.rhino</artifactId>
93+
<version>1.4.4-SNAPSHOT</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>com.ibm.wala</groupId>
97+
<artifactId>com.ibm.wala.cast.java.ecj</artifactId>
98+
<version>1.4.4-SNAPSHOT</version>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.ibm.wala</groupId>
102+
<artifactId>com.ibm.wala.cast.java</artifactId>
103+
<version>1.4.4-SNAPSHOT</version>
104+
</dependency>
105+
<dependency>
106+
<groupId>com.ibm.wala</groupId>
107+
<artifactId>com.ibm.wala.ide</artifactId>
108+
<version>1.4.4-SNAPSHOT</version>
109+
</dependency>
110+
<dependency>
111+
<groupId>com.ibm.wala</groupId>
112+
<artifactId>com.ibm.wala.ide.jdt</artifactId>
113+
<version>1.4.4-SNAPSHOT</version>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.ibm.wala</groupId>
117+
<artifactId>com.ibm.wala.cast.js</artifactId>
118+
<version>1.4.4-SNAPSHOT</version>
119+
</dependency>
120+
<dependency>
121+
<groupId>com.ibm.wala</groupId>
122+
<artifactId>com.ibm.wala.cast</artifactId>
123+
<version>1.4.4-SNAPSHOT</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>com.ibm.wala</groupId>
127+
<artifactId>com.ibm.wala.core</artifactId>
128+
<version>1.4.4-SNAPSHOT</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>com.ibm.wala</groupId>
132+
<artifactId>com.ibm.wala.shrike</artifactId>
133+
<version>1.4.4-SNAPSHOT</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>com.ibm.wala</groupId>
137+
<artifactId>com.ibm.wala.util</artifactId>
138+
<version>1.4.4-SNAPSHOT</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>com.ibm.wala</groupId>
142+
<artifactId>com.ibm.wala.cast.test</artifactId>
143+
<version>1.4.4-SNAPSHOT</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.ibm.wala</groupId>
147+
<artifactId>com.ibm.wala.core.tests</artifactId>
148+
<version>1.4.4-SNAPSHOT</version>
149+
</dependency>
150+
<dependency>
151+
<groupId>org.eclipse.core</groupId>
152+
<artifactId>org.eclipse.core.resources</artifactId>
153+
<version>3.7.100</version>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.eclipse.jdt</groupId>
157+
<artifactId>org.eclipse.jdt.core</artifactId>
158+
<version>3.12.3</version>
159+
</dependency>
36160
<dependency>
37161
<groupId>junit</groupId>
38162
<artifactId>junit</artifactId>
39-
<version>4.11</version>
163+
<version>4.12</version>
40164
<scope>test</scope>
41165
</dependency>
42-
</dependencies>
166+
</dependencies>
43167
</project>

‎com.ibm.wala.memsat.testdata/pom.xml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>com.ibm.wala</groupId>
4+
<artifactId>com.ibm.wala.memsat.testdata</artifactId>
5+
<version>0.0.1-SNAPSHOT</version>
6+
<name>com.ibm.wala.memsat.testdata</name>
7+
<description>MemSAT testdata</description>
8+
<build>
9+
<sourceDirectory>source</sourceDirectory>
10+
<plugins>
11+
<plugin>
12+
<artifactId>maven-compiler-plugin</artifactId>
13+
<version>3.1</version>
14+
<configuration>
15+
<source>1.8</source>
16+
<target>1.8</target>
17+
</configuration>
18+
</plugin>
19+
</plugins>
20+
<pluginManagement>
21+
<plugins>
22+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
23+
<plugin>
24+
<groupId>org.eclipse.m2e</groupId>
25+
<artifactId>lifecycle-mapping</artifactId>
26+
<version>1.0.0</version>
27+
<configuration>
28+
<lifecycleMappingMetadata>
29+
<pluginExecutions>
30+
<pluginExecution>
31+
<pluginExecutionFilter>
32+
<groupId>
33+
org.apache.maven.plugins
34+
</groupId>
35+
<artifactId>
36+
maven-antrun-plugin
37+
</artifactId>
38+
<versionRange>[1.8,)</versionRange>
39+
<goals>
40+
<goal>run</goal>
41+
</goals>
42+
</pluginExecutionFilter>
43+
<action>
44+
<ignore></ignore>
45+
</action>
46+
</pluginExecution>
47+
</pluginExecutions>
48+
</lifecycleMappingMetadata>
49+
</configuration>
50+
</plugin>
51+
</plugins>
52+
</pluginManagement>
53+
</build>
54+
<dependencies>
55+
<dependency>
56+
<groupId>org.osgi</groupId>
57+
<artifactId>org.osgi.framework</artifactId>
58+
<version>1.8.0</version>
59+
</dependency>
60+
</dependencies>
61+
</project>

‎com.ibm.wala.memsat/.project

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,14 @@
2020
<arguments>
2121
</arguments>
2222
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
2328
</buildSpec>
2429
<natures>
30+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2531
<nature>org.eclipse.jdt.core.javanature</nature>
2632
<nature>org.eclipse.pde.PluginNature</nature>
2733
</natures>

0 commit comments

Comments
 (0)