From eb6190e61a98d4d4361f42c2d64920c736853db4 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sun, 14 Jun 2015 08:54:59 +1000 Subject: [PATCH] Do not link test process to libprocps The test process introduced at 420cd9c7 incorrectly linked to libprocps which made the CI runner fail. --- Makefile.am | 2 ++ testsuite/config/unix.exp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f5b2325b..8c5b9df5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -229,6 +229,8 @@ lib_test_fileutils_SOURCES = lib/test_fileutils.c lib/fileutils.c lib_test_fileutils_LDADD = lib_test_nsutils_SOURCES = lib/test_nsutils.c lib/nsutils.c lib_test_nsutils_LDADD = +lib_test_process_SOURCES = lib/test_process.c +lib_test_process_LDADD = if EXAMPLE_FILES sysconf_DATA = sysctl.conf diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp index 566fc7df..bbee2333 100644 --- a/testsuite/config/unix.exp +++ b/testsuite/config/unix.exp @@ -120,7 +120,7 @@ proc expect_table_dsc { test match_header match_item } { proc make_testproc { } { global testproc_path testproc_comm testproc1_pid testproc2_pid topdir - set testproc_realpath "${topdir}/lib/.libs/test_process" + set testproc_realpath "${topdir}/lib/test_process" set testproc_comm "spcorp" set testproc_path [ exec mktemp -u ]