github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix and unmute VectorSystemPropertyTests (#115927)

Browse source
This commit is contained in:
Chris Hegarty 2024-11-01 13:07:03 +00:00 • committed by GitHub
parent 7de15a0cb8
commit 0aa25a9023
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/native/build.gradle
View file

@ -21,6 +21,11 @@ dependencies {
} }
} }
tasks.named("test").configure {
// this is necessary so that VectorSystemPropertyTests can invoke java
systemProperty "tests.system_call_filter", "false"
}
tasks.withType(CheckForbiddenApisTask).configureEach { tasks.withType(CheckForbiddenApisTask).configureEach {
replaceSignatureFiles 'jdk-signatures' replaceSignatureFiles 'jdk-signatures'
} }

6
libs/native/src/test/java/org/elasticsearch/nativeaccess/VectorSystemPropertyTests.java
View file

@ -9,6 +9,7 @@
package org.elasticsearch.nativeaccess; package org.elasticsearch.nativeaccess;
import org.apache.lucene.util.Constants;
import org.elasticsearch.core.SuppressForbidden; import org.elasticsearch.core.SuppressForbidden;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.ESTestCase.WithoutSecurityManager; import org.elasticsearch.test.ESTestCase.WithoutSecurityManager;
@ -34,6 +35,8 @@ public class VectorSystemPropertyTests extends ESTestCase {
@BeforeClass @BeforeClass
public static void setup() throws Exception { public static void setup() throws Exception {
assumeTrue("native scorers are not on Windows", Constants.WINDOWS == false);
var classBytes = InMemoryJavaCompiler.compile("p.Test", TEST_SOURCE); var classBytes = InMemoryJavaCompiler.compile("p.Test", TEST_SOURCE);
Map<String, byte[]> jarEntries = new HashMap<>(); Map<String, byte[]> jarEntries = new HashMap<>();
jarEntries.put("p/Test.class", classBytes); jarEntries.put("p/Test.class", classBytes);
@ -47,7 +50,8 @@ public class VectorSystemPropertyTests extends ESTestCase {
var process = new ProcessBuilder( var process = new ProcessBuilder(
getJavaExecutable(), getJavaExecutable(),
"-D" + ENABLE_JDK_VECTOR_LIBRARY + "=false", "-D" + ENABLE_JDK_VECTOR_LIBRARY + "=false",
"-Xms4m", "-Xms16m",
"-Xmx16m",
"-cp", "-cp",
jarPath + File.pathSeparator + System.getProperty("java.class.path"), jarPath + File.pathSeparator + System.getProperty("java.class.path"),
"-Des.nativelibs.path=" + System.getProperty("es.nativelibs.path"), "-Des.nativelibs.path=" + System.getProperty("es.nativelibs.path"),

3
muted-tests.yml
View file

@ -17,9 +17,6 @@ tests:
- class: "org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests" - class: "org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests"
issue: "https://github.com/elastic/elasticsearch/issues/110408" issue: "https://github.com/elastic/elasticsearch/issues/110408"
method: "testCreateAndRestorePartialSearchableSnapshot" method: "testCreateAndRestorePartialSearchableSnapshot"
- class: org.elasticsearch.nativeaccess.VectorSystemPropertyTests
method: testSystemPropertyDisabled
issue: https://github.com/elastic/elasticsearch/issues/110949
- class: org.elasticsearch.packaging.test.DockerTests - class: org.elasticsearch.packaging.test.DockerTests
method: test021InstallPlugin method: test021InstallPlugin
issue: https://github.com/elastic/elasticsearch/issues/110343 issue: https://github.com/elastic/elasticsearch/issues/110343