diff options
Diffstat (limited to 'test/postinstall/cpp_app')
| -rw-r--r-- | test/postinstall/cpp_app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/postinstall/cpp_app/Makefile.am | 2 | ||||
| -rw-r--r-- | test/postinstall/cpp_app/makefile.mak | 2 | ||||
| -rwxr-xr-x | test/postinstall/cpp_app/test_ldd.sh | 4 | ||||
| -rwxr-xr-x | test/postinstall/cpp_app/test_libpath.sh | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/test/postinstall/cpp_app/CMakeLists.txt b/test/postinstall/cpp_app/CMakeLists.txt index 1f011082..467b6bdf 100644 --- a/test/postinstall/cpp_app/CMakeLists.txt +++ b/test/postinstall/cpp_app/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(cpp_app PRIVATE ${USE_PROJ_NAME}::proj) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/..) include(common) -add_test_ldd(cpp_app) +add_test_libpath(cpp_app) add_test_transform(cpp_app) add_test_searchpath(cpp_app) add_test_version(cpp_app) diff --git a/test/postinstall/cpp_app/Makefile.am b/test/postinstall/cpp_app/Makefile.am index 5451403a..eaf3decd 100644 --- a/test/postinstall/cpp_app/Makefile.am +++ b/test/postinstall/cpp_app/Makefile.am @@ -3,7 +3,7 @@ cpp_app_SOURCES = cpp_app.cpp cpp_app_CXXFLAGS = $(PROJ_CFLAGS) cpp_app_LDADD = $(PROJ_LIBS) TESTS = \ - test_ldd.sh \ + test_libpath.sh \ test_transform.sh \ test_searchpath.sh \ test_version.sh diff --git a/test/postinstall/cpp_app/makefile.mak b/test/postinstall/cpp_app/makefile.mak index 8d84785f..5c5f2505 100644 --- a/test/postinstall/cpp_app/makefile.mak +++ b/test/postinstall/cpp_app/makefile.mak @@ -1,7 +1,7 @@ PROGRAM = cpp_app OBJECTS = $(addsuffix .o,$(PROGRAM)) TESTS = \ - test_ldd.sh \ + test_libpath.sh \ test_transform.sh \ test_searchpath.sh \ test_version.sh diff --git a/test/postinstall/cpp_app/test_ldd.sh b/test/postinstall/cpp_app/test_ldd.sh deleted file mode 100755 index 2e8cd5ea..00000000 --- a/test/postinstall/cpp_app/test_ldd.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. ../common.sh - -test_ldd cpp_app libproj diff --git a/test/postinstall/cpp_app/test_libpath.sh b/test/postinstall/cpp_app/test_libpath.sh new file mode 100755 index 00000000..08222e66 --- /dev/null +++ b/test/postinstall/cpp_app/test_libpath.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. ../common.sh + +EXPECTED_LIBPATH="$(pkg-config proj --variable=libdir)" + +test_libpath cpp_app "${EXPECTED_LIBPATH}" libproj |
