diff options
| author | Kenny Root <kroot@google.com> | 2013-02-01 11:26:09 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-02-01 11:32:22 -0800 |
| commit | 5f1f97c39628995ed1d1913c192d91e17ea26ef1 (patch) | |
| tree | 55ad9bd0c1218390b9733ad21b5f51d0a1fe26de | |
| parent | bae3d395f7a0fcb871d46d23ea61dd329742335d (diff) | |
| download | libcore-5f1f97c39628995ed1d1913c192d91e17ea26ef1.zip libcore-5f1f97c39628995ed1d1913c192d91e17ea26ef1.tar.gz libcore-5f1f97c39628995ed1d1913c192d91e17ea26ef1.tar.bz2 | |
Change native test module name
Change-Id: Ie4f9c5a2fb440d8455748bc30949b8b956d75625
| -rw-r--r-- | NativeCode.mk | 4 | ||||
| -rw-r--r-- | luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 8878c96..b7c8b0e 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -139,7 +139,7 @@ LOCAL_C_INCLUDES := $(test_c_includes) LOCAL_SHARED_LIBRARIES := $(test_shared_libraries) LOCAL_STATIC_LIBRARIES := $(test_static_libraries) LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := libjavacore-test +LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk include $(BUILD_SHARED_LIBRARY) @@ -174,7 +174,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := libjavacore-test + LOCAL_MODULE := libjavacoretests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES := $(test_shared_libraries) LOCAL_STATIC_LIBRARIES := $(test_static_libraries) diff --git a/luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java b/luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java index 5434702..fb351e8 100644 --- a/luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java +++ b/luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java @@ -56,6 +56,8 @@ import org.apache.harmony.xnet.provider.jsse.NativeCrypto.SSLHandshakeCallbacks; import static org.apache.harmony.xnet.provider.jsse.NativeCrypto.SSL_MODE_HANDSHAKE_CUTTHROUGH; public class NativeCryptoTest extends TestCase { + /** Corresponds to the native test library "libjavacoretests.so" */ + private static final String NATIVE_LIBRARY_NAME = "javacoretests"; private static final int NULL = 0; private static final FileDescriptor INVALID_FD = new FileDescriptor(); @@ -2027,8 +2029,8 @@ public class NativeCryptoTest extends TestCase { assertEquals(1, NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "LIST_ADD", "2", 0)); // Do a direct load of the ENGINE. - assertEquals(1, - NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "SO_PATH", "javacore-test", 0)); + assertEquals(1, NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "SO_PATH", + NATIVE_LIBRARY_NAME, 0)); assertEquals(1, NativeCrypto.ENGINE_ctrl_cmd_string(dynEngine, "LOAD", null, 0)); } finally { NativeCrypto.ENGINE_finish(dynEngine); |