Skip to content

Commit c09273b

Browse files
committed
linux: Disable shared texture test
1 parent 4af5925 commit c09273b

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

make/test/JtregNativeJdk.gmk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ ifeq ($(call isTargetOs, linux), true)
127127
BUILD_JDK_JTREG_LIBRARIES_STRIP_SYMBOLS_libFib := false
128128
# nio tests' libCreationTimeHelper native needs -ldl linker flag
129129
BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libCreationTimeHelper := -ldl
130-
BUILD_JDK_JTREG_LIBRARIES_LIBS_libSharedTexturesTest := -lX11 -lGL -lGLX
130+
# libSharedTexturesTest needs X11 and GL libraries
131+
# BUILD_JDK_JTREG_LIBRARIES_LIBS_libSharedTexturesTest := -lX11 -lGL -lGLX
131132
endif
132133

133134
ifeq ($(ASAN_ENABLED), true)

test/jdk/jb/SharedTextures/SharedTexturesTest.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@
3939
* @requires (os.family=="windows")
4040
*/
4141

42-
/**
43-
* @test
44-
* @key headful
45-
* @summary The test creates a BufferedImage and makes a texture from its content.
46-
* The texture gets wrapped into a TextureWrapperImage image by SharedTextures JBR API service.
47-
* The TextureWrapperImage is copied into a BufferedImage and VolatileImage and expects that all images have
48-
* the same content.
49-
* @library /test/lib
50-
* @compile --add-exports java.desktop/com.jetbrains.desktop=ALL-UNNAMED SharedTexturesTest.java
51-
* @run main/othervm/native -Dsun.java2d.uiScale=1 -Dsun.java2d.opengl=True --enable-native-access=ALL-UNNAMED --add-exports java.desktop/com.jetbrains.desktop=ALL-UNNAMED SharedTexturesTest
52-
* @requires (os.family=="linux")
53-
*/
54-
5542
public class SharedTexturesTest {
5643
static {
5744
System.loadLibrary("SharedTexturesTest");

test/jdk/jb/SharedTextures/libSharedTexturesTest.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#ifndef LINUX // remove this line to this text compile on Linux
2+
13
#include <jni.h>
24
#include <stdlib.h>
35

@@ -278,3 +280,5 @@ JNIEXPORT void JNICALL Java_SharedTexturesTest_disposeTexture
278280
glDeleteTextures(1, &texId);
279281
}
280282
}
283+
284+
#endif // remove this line to this text compile on Linux

0 commit comments

Comments
 (0)