diff --git a/.blaze/blaze.conf b/.blaze/blaze.conf index ee2682c..e14c728 100644 --- a/.blaze/blaze.conf +++ b/.blaze/blaze.conf @@ -1,4 +1,6 @@ blaze.dependencies = [ + "com.fizzed:blaze-ssh" + "com.fizzed:buildx:1.0.7" "com.fizzed:jne:4.1.1" ] diff --git a/.blaze/blaze.java b/.blaze/blaze.java index d476af6..ba7e928 100644 --- a/.blaze/blaze.java +++ b/.blaze/blaze.java @@ -1,6 +1,8 @@ import com.fizzed.blaze.Config; import com.fizzed.blaze.Contexts; import com.fizzed.blaze.Task; +import com.fizzed.buildx.Buildx; +import com.fizzed.buildx.Target; import com.fizzed.jne.HardwareArchitecture; import com.fizzed.jne.JavaHome; import com.fizzed.jne.JavaHomeFinder; @@ -87,4 +89,26 @@ public void test_all_jdks() throws Exception { jdks.forEach(jdk -> log.info(" {}", jdk)); } + private final List crossTestTargets = asList( + new Target("linux", "x64").setTags("test").setHost("build-x64-linux-latest"), + new Target("linux", "arm64").setTags("test").setHost("build-arm64-linux-latest"), + new Target("linux", "riscv64").setTags("test").setHost("build-riscv64-linux-latest"), + new Target("macos", "x64").setTags("test").setHost("build-x64-macos-latest"), + new Target("macos", "arm64").setTags("test").setHost("build-arm64-macos-latest"), + new Target("windows", "x64").setTags("test").setHost("build-x64-windows-latest"), + new Target("windows", "arm64").setTags("test").setHost("build-arm64-windows-latest"), + new Target("freebsd", "x64").setTags("test").setHost("build-x64-freebsd-latest"), + new Target("openbsd", "x64").setTags("test").setHost("build-x64-openbsd-latest") + ); + + @Task(order = 1) + public void cross_tests() throws Exception { + new Buildx(crossTestTargets) + .tags("test") + .execute((target, project) -> { + project.action("mvn", "clean", "test") + .run(); + }); + } + } \ No newline at end of file diff --git a/.blaze/pom.xml b/.blaze/pom.xml index cfa9dbe..df524a0 100644 --- a/.blaze/pom.xml +++ b/.blaze/pom.xml @@ -60,6 +60,16 @@ zt-exec 1.12 + + com.fizzed + blaze-ssh + 1.5.0 + + + com.fizzed + buildx + 1.0.7 + com.fizzed jne diff --git a/.github/workflows/macos-x64.yaml b/.github/workflows/macos-arm64.yaml similarity index 95% rename from .github/workflows/macos-x64.yaml rename to .github/workflows/macos-arm64.yaml index 4b6beb6..21c7cc5 100644 --- a/.github/workflows/macos-x64.yaml +++ b/.github/workflows/macos-arm64.yaml @@ -1,4 +1,4 @@ -name: MacOS x64 +name: MacOS arm64 on: - push - workflow_dispatch diff --git a/.gitignore b/.gitignore index 261d9e7..1c402d3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ target *.iml nb-configuration.xml .idea +.buildx diff --git a/README.md b/README.md index deb568d..bf92e28 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,28 @@ [![Maven Central](https://img.shields.io/maven-central/v/com.fizzed/bigmap?color=blue&style=flat-square)](https://mvnrepository.com/artifact/com.fizzed/bigmap) +## Automated Testing + +The following Java versions and platforms are tested using GitHub workflows: + [![Java 8](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/java8.yaml?branch=master&label=Java%208&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/java8.yaml) [![Java 11](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/java11.yaml?branch=master&label=Java%2011&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/java11.yaml) [![Java 17](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/java17.yaml?branch=master&label=Java%2017&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/java17.yaml) [![Java 21](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/java21.yaml?branch=master&label=Java%2021&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/java21.yaml) [![Linux x64](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/java11.yaml?branch=master&label=Linux%20x64&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/java11.yaml) -[![MacOS x64](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/macos-x64.yaml?branch=master&label=MacOS%20x64&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/macos-x64.yaml) +[![MacOS arm64](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/macos-arm64.yaml?branch=master&label=MacOS%20arm64&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/macos-arm64.yaml) [![Windows x64](https://img.shields.io/github/actions/workflow/status/fizzed/bigmap/windows-x64.yaml?branch=master&label=Windows%20x64&style=flat-square)](https://github.com/fizzed/bigmap/actions/workflows/windows-x64.yaml) +The following platforms are tested using the [Fizzed, Inc.](http://fizzed.com) build system: + +![Linux arm64](https://img.shields.io/badge/Linux%20arm64-passing-green) +![Linux riscv64](https://img.shields.io/badge/Linux%20riscv64-passing-green) +![MacOS x64](https://img.shields.io/badge/MacOS%20x64-passing-green) +![Windows arm64](https://img.shields.io/badge/Windows%20arm64-passing-green) +![FreeBSD x64](https://img.shields.io/badge/FreeBSD%20x64-passing-green) +![OpenBSD x64](https://img.shields.io/badge/OpenBSD%20x64-passing-green) + ## Overview Lightweight Map, SortedMap, LinkedMap, Set, and SortedSet implementation(s) with minimal 3rd party dependencies that alleviates memory diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java index 905d4e8..ec7f778 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java @@ -16,6 +16,7 @@ package com.fizzed.bigmap; import org.junit.jupiter.api.Test; + import java.io.IOException; import java.nio.file.Files; import java.util.*; diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java index ae419c7..31b9a7f 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java @@ -16,12 +16,25 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.rocksdb.RocksBigLinkedMapBuilder; +import com.fizzed.jne.HardwareArchitecture; +import com.fizzed.jne.NativeTarget; +import com.fizzed.jne.OperatingSystem; +import org.junit.jupiter.api.condition.DisabledIf; import java.nio.file.Paths; import java.util.Map; +@DisabledIf("isUnsupportedOs") public class RocksBigLinkedMapTest extends AbstractBigLinkedMapTest { + static public boolean isUnsupportedOs() { + final NativeTarget current = NativeTarget.detect(); + return current.getOperatingSystem() == OperatingSystem.FREEBSD + || current.getOperatingSystem() == OperatingSystem.OPENBSD + || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64) + || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64); + } + @Override public Map newMap(Class keyType, Class valueType) { return new RocksBigLinkedMapBuilder() diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java index d2d9268..7fbba20 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java @@ -16,12 +16,25 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.rocksdb.RocksBigLinkedSetBuilder; +import com.fizzed.jne.HardwareArchitecture; +import com.fizzed.jne.NativeTarget; +import com.fizzed.jne.OperatingSystem; +import org.junit.jupiter.api.condition.DisabledIf; import java.nio.file.Paths; import java.util.Set; +@DisabledIf("isUnsupportedOs") public class RocksBigLinkedSetTest extends AbstractBigLinkedSetTest { + static public boolean isUnsupportedOs() { + final NativeTarget current = NativeTarget.detect(); + return current.getOperatingSystem() == OperatingSystem.FREEBSD + || current.getOperatingSystem() == OperatingSystem.OPENBSD + || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64) + || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64); + } + @Override public Set newSet(Class valueType) { return new RocksBigLinkedSetBuilder() diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java index 52779bb..edcd96a 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java @@ -16,12 +16,25 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.rocksdb.RocksBigMapBuilder; +import com.fizzed.jne.HardwareArchitecture; +import com.fizzed.jne.NativeTarget; +import com.fizzed.jne.OperatingSystem; +import org.junit.jupiter.api.condition.DisabledIf; import java.nio.file.Paths; import java.util.Map; +@DisabledIf("isUnsupportedOs") public class RocksBigMapTest extends AbstractBigMapTest { + static public boolean isUnsupportedOs() { + final NativeTarget current = NativeTarget.detect(); + return current.getOperatingSystem() == OperatingSystem.FREEBSD + || current.getOperatingSystem() == OperatingSystem.OPENBSD + || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64) + || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64); + } + @Override public Map newMap(Class keyType, Class valueType) { return new RocksBigMapBuilder() diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java index 35acde1..4aa96ab 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java @@ -16,12 +16,25 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.rocksdb.RocksBigSetBuilder; +import com.fizzed.jne.HardwareArchitecture; +import com.fizzed.jne.NativeTarget; +import com.fizzed.jne.OperatingSystem; +import org.junit.jupiter.api.condition.DisabledIf; import java.nio.file.Paths; import java.util.Set; +@DisabledIf("isUnsupportedOs") public class RocksBigSetTest extends AbstractBigSetTest { + static public boolean isUnsupportedOs() { + final NativeTarget current = NativeTarget.detect(); + return current.getOperatingSystem() == OperatingSystem.FREEBSD + || current.getOperatingSystem() == OperatingSystem.OPENBSD + || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64) + || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64); + } + @Override public Set newSet(Class valueType) { return new RocksBigSetBuilder() diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java index b1fb786..338bce8 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java @@ -16,10 +16,13 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.tkrzw.TkrzwBigLinkedMapBuilder; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Map; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigLinkedMapTest extends AbstractBigLinkedMapTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java index 1dabac5..f231006 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java @@ -16,10 +16,13 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.tkrzw.TkrzwBigLinkedSetBuilder; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Set; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigLinkedSetTest extends AbstractBigLinkedSetTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java index f6366c8..9789519 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java @@ -16,10 +16,13 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.tkrzw.TkrzwBigMapBuilder; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Map; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigMapTest extends AbstractBigMapTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java index 5b3ab0c..16d4ae2 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java @@ -16,10 +16,13 @@ package com.fizzed.bigmap; import com.fizzed.bigmap.tkrzw.TkrzwBigSetBuilder; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Set; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigSetTest extends AbstractBigSetTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java index 728ad5e..ddde2fd 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import java.util.Map; -@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows") +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigLinkedMapTest extends AbstractBigLinkedMapTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java index a690ae6..d582456 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import java.util.Set; -@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows") +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigLinkedSetTest extends AbstractBigLinkedSetTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java index b7e08bd..760b384 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import java.util.Map; -@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows") +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigMapTest extends AbstractBigMapTest { @Override diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java index 02a1819..bd95f1b 100644 --- a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java +++ b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java @@ -22,7 +22,7 @@ import java.nio.file.Paths; import java.util.Set; -@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows") +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigSetTest extends AbstractBigSetTest { @Override diff --git a/bigmap-rocksdb/pom.xml b/bigmap-rocksdb/pom.xml index cd7d058..8e45697 100644 --- a/bigmap-rocksdb/pom.xml +++ b/bigmap-rocksdb/pom.xml @@ -25,6 +25,12 @@ + + com.fizzed + jne + test + + org.hamcrest java-hamcrest diff --git a/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java b/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java index 530fc59..334d566 100644 --- a/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java +++ b/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java @@ -15,7 +15,13 @@ */ package com.fizzed.bigmap.rocksdb; +import com.fizzed.jne.HardwareArchitecture; +import com.fizzed.jne.NativeTarget; +import com.fizzed.jne.OperatingSystem; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Map; @@ -24,8 +30,17 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; +@DisabledIf("isUnsupportedOs") public class RocksBigMapTest { + static public boolean isUnsupportedOs() { + final NativeTarget current = NativeTarget.detect(); + return current.getOperatingSystem() == OperatingSystem.FREEBSD + || current.getOperatingSystem() == OperatingSystem.OPENBSD + || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64) + || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64); + } + @Test public void putGetWithStrings() { final Map map = new RocksBigMapBuilder() diff --git a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java index c82f8c6..68ec082 100644 --- a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java +++ b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java @@ -2,9 +2,8 @@ import com.fizzed.bigmap.BigMap; import org.junit.jupiter.api.Test; -import tkrzw.DBM; -import tkrzw.Iterator; -import tkrzw.Status; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.io.IOException; import java.nio.file.Files; @@ -15,6 +14,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigMapTest { @Test diff --git a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java index 25d1c8a..2629a4a 100644 --- a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java +++ b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java @@ -1,10 +1,13 @@ package com.fizzed.bigmap.tkrzw; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnOs; +import org.junit.jupiter.api.condition.OS; import java.nio.file.Paths; import java.util.Set; +@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD }) public class TkrzwBigSetTest { @Test diff --git a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java index b12ed9f..d07f187 100644 --- a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java +++ b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java @@ -15,7 +15,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -@DisabledOnOs(OS.WINDOWS) +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigMapTest { @Test diff --git a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java index ce67257..be34059 100644 --- a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java +++ b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java @@ -7,7 +7,7 @@ import java.nio.file.Paths; import java.util.Set; -@DisabledOnOs(OS.WINDOWS) +@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD }) public class TokyoBigSetTest { @Test diff --git a/blaze.jar b/blaze.jar index 5acc29e..d24b673 100644 Binary files a/blaze.jar and b/blaze.jar differ diff --git a/pom.xml b/pom.xml index b1301a5..64b3ba5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.fizzed maven-parent - 2.5.0 + 2.7.0 @@ -126,7 +126,13 @@ - + + + com.fizzed + jne + 4.3.0 + + com.fizzed crux-util @@ -148,7 +154,7 @@ org.junit.jupiter junit-jupiter - 5.8.1 + 5.10.3