Skip to content

Commit

Permalink
tests: fix the path to plugins in builddir
Browse files Browse the repository at this point in the history
We didn't update that path since "src" became "hwloc" in 2.0,
which means make check didn't use plugins at all when built
with --enable-plugins.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
(cherry picked from commit 06cd8b3)
  • Loading branch information
bgoglin committed Apr 28, 2019
1 parent 60d7eb1 commit 6fbf6f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions tests/hwloc/ports/Makefile.am
@@ -1,4 +1,4 @@
# Copyright © 2009-2016 Inria. All rights reserved.
# Copyright © 2009-2019 Inria. All rights reserved.
# Copyright © 2009, 2011-2012 Université Bordeaux
# Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved.
# See COPYING in top-level directory.
Expand Down Expand Up @@ -28,10 +28,10 @@ check_LIBRARIES = \
endif HWLOC_HAVE_LINUX

# Note that AC_CONFIG_LINKS sets up the sym links for the files in
# this directory (back to the $top_srcdir/src directory). So if you
# this directory (back to the $top_srcdir/hwloc directory). So if you
# need more sym-linked files in here, go edit configure.ac. Note that
# we have to use sym links in here rather than just directly
# referencing the files via $HWLOC_top_srcdir/src/foo.c because of
# referencing the files via $HWLOC_top_srcdir/hwloc/foo.c because of
# dependencies issues when using the Automake option "subdir-objects".
# We nodist these because they're created by configure.

Expand Down
4 changes: 2 additions & 2 deletions tests/hwloc/wrapper.sh.in
Expand Up @@ -2,14 +2,14 @@
#-*-sh-*-

#
# Copyright © 2012-2018 Inria. All rights reserved.
# Copyright © 2012-2019 Inria. All rights reserved.
# See COPYING in top-level directory.
#

HWLOC_top_builddir="@HWLOC_top_builddir@"
xmlbuffer=xmlbuffer@EXEEXT@

HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/src
HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc
export HWLOC_PLUGINS_PATH

HWLOC_DEBUG_CHECK=1
Expand Down

0 comments on commit 6fbf6f4

Please sign in to comment.