Skip to content

Commit 8c28b29

Browse files
jsquyresjsquyres
committed
tests: fix library name
Use @OPAL_LIB_PREFIX@ as appropriate in the library that we link against. (cherry picked from commit open-mpi/ompi@1340d51)
1 parent 81f5f89 commit 8c28b29

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

‎test/event/Makefile.am‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12+
# Copyright (c) 2015-2016 Cisco Systems, Inc. All rights reserved.
1213
# $COPYRIGHT$
1314
#
1415
# Additional copyrights may follow
@@ -28,17 +29,17 @@ TESTS = $(check_PROGRAMS)
2829
signal_test_SOURCES = signal-test.c
2930
signal_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
3031
signal_test_LDADD = \
31-
$(top_builddir)/opal/libopen-pal.la
32+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
3233
signal_test_DEPENDENCIES = $(signal_test_LDADD)
3334

3435
time_test_SOURCES = time-test.c
3536
time_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
3637
time_test_LDADD = \
37-
$(top_builddir)/opal/libopen-pal.la
38+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
3839
time_test_DEPENDENCIES = $(time_test_LDADD)
3940

4041
event_test_SOURCES = event-test.c
4142
event_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
4243
event_test_LDADD = \
43-
$(top_builddir)/opal/libopen-pal.la
44+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
4445
event_test_DEPENDENCIES = $(event_test_LDADD)

‎test/memchecker/Makefile.am‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# University of Stuttgart. All rights reserved.
1010
# Copyright (c) 2004-2005 The Regents of the University of California.
1111
# All rights reserved.
12+
# Copyright (c) 2015-2016 Cisco Systems, Inc. All rights reserved.
1213
# $COPYRIGHT$
1314
#
1415
# Additional copyrights may follow
@@ -30,31 +31,31 @@ TESTS = \
3031
access_buffer_test_SOURCES = access_buffer_test.c
3132
access_buffer_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
3233
access_buffer_test_LDADD = \
33-
$(top_builddir)/ompi/libmpi.la
34+
$(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la
3435
access_buffer_test_DEPENDENCIES = $(access_buffer_test_LDADD)
3536

3637
irecv_init_check_SOURCES = irecv_init_check.c
3738
irecv_init_check_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
3839
irecv_init_check_LDADD = \
39-
$(top_builddir)/ompi/libmpi.la
40+
$(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la
4041
irecv_init_check_DEPENDENCIES = $(irecv_init_check_LDADD)
4142

4243

4344
irecv_uninit_check_SOURCES = irecv_uninit_check.c
4445
irecv_uninit_check_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
4546
irecv_uninit_check_LDADD = \
46-
$(top_builddir)/ompi/libmpi.la
47+
$(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la
4748
irecv_uninit_check_DEPENDENCIES = $(irecv_uninit_check_LDADD)
4849

4950
non_blocking_send_test_SOURCES = non_blocking_send_test.c
5051
non_blocking_send_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
5152
non_blocking_send_test_LDADD = \
52-
$(top_builddir)/ompi/libmpi.la
53+
$(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la
5354
non_blocking_send_test_DEPENDENCIES = $(non_blocking_send_test_LDADD)
5455

5556

5657
non_blocking_recv_test_SOURCES = non_blocking_recv_test.c
5758
non_blocking_recv_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
5859
non_blocking_recv_test_LDADD = \
59-
$(top_builddir)/ompi/libmpi.la
60+
$(top_builddir)/ompi/lib@OPAL_LIB_PREFIX@mpi.la
6061
non_blocking_recv_test_DEPENDENCIES = $(non_blocking_recv_test_LDADD)

‎test/runtime/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13+
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
1314
# $COPYRIGHT$
1415
#
1516
# Additional copyrights may follow
@@ -51,6 +52,6 @@ orte_init_finalize_DEPENDENCIES = $(orte_init_finalize_LDADD)
5152
opal_init_finalize_SOURCES = \
5253
opal_init_finalize.c
5354
opal_init_finalize_LDADD = \
54-
$(top_builddir)/opal/libopen-pal.la \
55+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
5556
$(top_builddir)/test/support/libsupport.a
5657
opal_init_finalize_DEPENDENCIES = $(opal_init_finalize_LDADD)

‎test/threads/Makefile.am‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# University of Stuttgart. All rights reserved.
1111
# Copyright (c) 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
13+
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
1314
# $COPYRIGHT$
1415
#
1516
# Additional copyrights may follow
@@ -32,12 +33,12 @@ TESTS =
3233
opal_thread_SOURCES = opal_thread.c
3334
opal_thread_LDADD = \
3435
$(top_builddir)/test/support/libsupport.a \
35-
$(top_builddir)/opal/libopen-pal.la
36+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
3637
opal_thread_DEPENDENCIES = $(opal_thread_LDADD)
3738

3839
opal_condition_SOURCES = opal_condition.c
3940
opal_condition_LDADD = \
4041
$(top_builddir)/test/support/libsupport.a \
41-
$(top_builddir)/opal/libopen-pal.la
42+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la
4243
opal_condition_DEPENDENCIES = $(opal_condition_LDADD)
4344

‎test/util/Makefile.am‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# All rights reserved.
1212
# Copyright (c) 2012 Los Alamos National Security, LLC. All rights
1313
# reserved.
14+
# Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
1415
# $COPYRIGHT$
1516
#
1617
# Additional copyrights may follow
@@ -69,26 +70,26 @@ TESTS = \
6970

7071
opal_bit_ops_SOURCES = opal_bit_ops.c
7172
opal_bit_ops_LDADD = \
72-
$(top_builddir)/opal/libopen-pal.la \
73+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
7374
$(top_builddir)/test/support/libsupport.a
7475
opal_bit_ops_DEPENDENCIES = $(opal_path_nfs_LDADD)
7576

7677

7778
opal_path_nfs_SOURCES = opal_path_nfs.c
7879
opal_path_nfs_LDADD = \
79-
$(top_builddir)/opal/libopen-pal.la \
80+
$(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
8081
$(top_builddir)/test/support/libsupport.a
8182
opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)
8283

8384
#opal_os_path_SOURCES = opal_os_path.c
8485
#opal_os_path_LDADD = \
85-
# $(top_builddir)/opal/libopen-pal.la \
86+
# $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
8687
# $(top_builddir)/test/support/libsupport.a
8788
#opal_os_path_DEPENDENCIES = $(opal_os_path_LDADD)
8889

8990
#opal_timer_SOURCES = opal_timer.c
9091
#opal_timer_LDADD = \
91-
# $(top_builddir)/opal/libopen-pal.la \
92+
# $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
9293
# $(top_builddir)/test/support/libsupport.a
9394
#opal_timer_DEPENDENCIES = $(opal_timer_LDADD)
9495

@@ -101,7 +102,7 @@ opal_path_nfs_DEPENDENCIES = $(opal_path_nfs_LDADD)
101102

102103
#opal_os_create_dirpath_SOURCES = opal_os_create_dirpath.c
103104
#opal_os_create_dirpath_LDADD = \
104-
# $(top_builddir)/opal/libopen-pal.la \
105+
# $(top_builddir)/opal/lib@OPAL_LIB_PREFIX@open-pal.la \
105106
# $(top_builddir)/test/support/libsupport.a
106107
#opal_os_create_dirpath_DEPENDENCIES = $(opal_os_create_dirpath_LDADD)
107108

0 commit comments

Comments
 (0)