Always build fuzz and jmh modules

dylibso · Aug 26, 2024 · 9ab2185 · 9ab2185
1 parent 88b8da3
commit 9ab2185
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 29 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -44,11 +44,9 @@ jobs:
           java-version: '${{ matrix.version }}'
           cache: maven
       - name: Check Style
-        run:  mvn -B spotless:check -Pbenchmarks -Pfuzz
+        run:  mvn -B spotless:check
       - name: Test Java
         run: mvn -B clean install
-      - name: Verify that nightly fuzz compiles
-        run: mvn -B test -DskipTests -Pfuzz -pl fuzz
 
   readme-ci:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
@@ -49,7 +49,7 @@ jobs:
           # Build everything
           mvn -B install -DskipTests
           # Run only the fuzz tests
-          mvn -B clean verify -Pfuzz -pl fuzz -Dfuzz.test.numeric=10 -Dfuzz.test.table=10
+          mvn -B clean verify -pl fuzz -DskipTests=false -Dfuzz.test.numeric=10 -Dfuzz.test.table=10
 
       - name: Create Pull Request with the crash repro
         uses: peter-evans/create-pull-request@v6

diff --git a/fuzz/README.md b/fuzz/README.md
@@ -28,7 +28,3 @@ export CHICORY_FUZZ_TYPES=numeric,table
 
 mvn install -Pfuzz -pl fuzz -Dtest="com.dylibso.chicory.fuzz.SingleReproTest#singleReproducer"
 ```
-
-## Import in IntelliJ
-
-Right click on `/fuzz/pom.xml` -> "Add as a Maven Project"
diff --git a/fuzz/pom.xml b/fuzz/pom.xml
@@ -13,6 +13,13 @@
   <name>Chicory - Fuzz</name>
   <description>Fuzzying Chicory</description>
 
+  <properties>
+    <skipTests>true</skipTests>
+
+    <fuzz.test.numeric>10</fuzz.test.numeric>
+    <fuzz.test.table>10</fuzz.test.table>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.dylibso.chicory</groupId>

diff --git a/jmh/pom.xml b/jmh/pom.xml
@@ -23,12 +23,12 @@
       <artifactId>runtime</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-core</artifactId>
+      <groupId>com.dylibso.chicory</groupId>
+      <artifactId>wasm</artifactId>
     </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
-      <artifactId>jmh-generator-annprocess</artifactId>
+      <artifactId>jmh-core</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -37,6 +37,8 @@
     <module>aot</module>
     <module>bom</module>
     <module>cli</module>
+    <module>fuzz</module>
+    <module>jmh</module>
     <module>log</module>
     <module>runtime</module>
     <module>runtime-tests</module>
@@ -651,16 +653,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>fuzz</id>
-      <modules>
-        <module>fuzz</module>
-      </modules>
-      <properties>
-        <fuzz.test.numeric>10</fuzz.test.numeric>
-        <fuzz.test.table>10</fuzz.test.table>
-      </properties>
-    </profile>
     <profile>
       <id>release</id>
       <distributionManagement>
@@ -704,11 +696,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>benchmarks</id>
-      <modules>
-        <module>jmh</module>
-      </modules>
-    </profile>
   </profiles>
 </project>
diff --git a/scripts/build-jmh-main.sh b/scripts/build-jmh-main.sh
@@ -7,5 +7,5 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
   cd "${SCRIPT_DIR}/.."
   rm -rf main
   git clone --depth 1 --branch main https://github.com/dylibso/chicory.git main
-  mvn -Dquickly -Pbenchmarks
+  mvn -Dquickly
 )
diff --git a/scripts/build-jmh.sh b/scripts/build-jmh.sh
@@ -5,5 +5,5 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 (
   cd "${SCRIPT_DIR}/.."
-  mvn -Dquickly -Pbenchmarks
+  mvn -Dquickly
 )