diff --git a/onionwrapper-core/src/test/java/org/briarproject/onionwrapper/TestUtils.java b/onionwrapper-core/src/test/java/org/briarproject/onionwrapper/TestUtils.java index 82ad9bd63cb4b0ac45b8635aa52e0ddbf1f38611..02c5136e733af07b6c4cca6a9d3e4c8d6ac3f4ee 100644 --- a/onionwrapper-core/src/test/java/org/briarproject/onionwrapper/TestUtils.java +++ b/onionwrapper-core/src/test/java/org/briarproject/onionwrapper/TestUtils.java @@ -66,7 +66,8 @@ public class TestUtils { else if (arch.equals("aarch64")) return "aarch64"; else if (arch.equals("arm")) return "armhf"; } else if (isMac()) { - return "any"; + if (arch.equals("amd64")) return "x86_64"; + else if (arch.equals("aarch64")) return "aarch64"; } return null; } diff --git a/onionwrapper-java/build.gradle b/onionwrapper-java/build.gradle index 0226df4eb2ec4129cd48c5e5427bb898a87d5498..c146d81f4955ea50db31d01577f2b2c16cb51cf9 100644 --- a/onionwrapper-java/build.gradle +++ b/onionwrapper-java/build.gradle @@ -29,9 +29,9 @@ dependencies { testImplementation "org.briarproject:obfs4proxy-$currentOS.id:0.0.14-tor2" testImplementation "org.briarproject:snowflake-$currentOS.id:2.5.1" } else if (currentOS == MacOS) { - testImplementation "org.briarproject:tor-macos-torbrowser:0.4.7.13" - testImplementation "org.briarproject:obfs4proxy-macos-torbrowser:0.0.14" - testImplementation "org.briarproject:snowflake-macos-torbrowser:2.5.1" + testImplementation "org.briarproject:tor-macos-pipelines:0.4.7.13-2" + testImplementation "org.briarproject:obfs4proxy-macos-pipelines:0.0.14-tor2" + testImplementation "org.briarproject:snowflake-macos-pipelines:2.5.1" } } diff --git a/onionwrapper-java/src/test/java/org/briarproject/onionwrapper/ResourcesMacTest.java b/onionwrapper-java/src/test/java/org/briarproject/onionwrapper/ResourcesMacTest.java index 884225b9394cd202862053405bc0da5dd5e035f8..b8bd2fccc87eea64419af7f9d4f482c693ac1233 100644 --- a/onionwrapper-java/src/test/java/org/briarproject/onionwrapper/ResourcesMacTest.java +++ b/onionwrapper-java/src/test/java/org/briarproject/onionwrapper/ResourcesMacTest.java @@ -16,22 +16,22 @@ public class ResourcesMacTest { @Test public void testCanLoadTor() { - testCanLoadResource("any/tor"); + testCanLoadResource("x86_64/tor"); } @Test public void testCanLoadLibEvent() { - testCanLoadResource("any/libevent-2.1.7.dylib"); + testCanLoadResource("x86_64/libevent-2.1.7.dylib"); } @Test public void testCanLoadObfs4() { - testCanLoadResource("any/obfs4proxy"); + testCanLoadResource("x86_64/obfs4proxy"); } @Test public void testCanLoadSnowflake() { - testCanLoadResource("any/snowflake"); + testCanLoadResource("x86_64/snowflake"); } private void testCanLoadResource(String name) {