testsuite: Update the library tests for new location

Signed-off-by: Craig Small <csmall@dropbear.xyz>

diff --git a/Makefile.am b/Makefile.am
index 25f1a6af31aa03110027002a01af1fed73f4aea1..9bb414823d41f4ad1cd9be9f4cdbc1d3009d7f4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -287,7 +287,7 @@ library_libproc2_la_SOURCES = \
        library/uptime.c \
        library/include/xtra-procps-debug.h
 
-library_libproc2_la_includedir = $(includedir)/procps/
+library_libproc2_la_includedir = $(includedir)/libproc2/
 library_libproc2_la_include_HEADERS = \
        library/include/diskstats.h \
        library/include/meminfo.h \

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 66db9f1f08d543eb5d07cc22c51288f931ddf3bc..ca73dda33dddef1873f697767dfcec78a641f504 100644 (file)
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -148,7 +148,7 @@ proc expect_spawn_retval { test retval } {
 proc make_pipeproc { } {
     global pipeproc_pid pipeproc_spawnid topdir
 
-    set testproc_realpath "${topdir}/lib/test_process"
+    set testproc_realpath "${topdir}/src/tests/test_process"
 
     set pipeproc_pid [ spawn $testproc_realpath ]
     set pipeproc_spawnid $spawn_id
@@ -157,7 +157,7 @@ proc make_pipeproc { } {
 proc make_testproc { } {
     global testproc_path testproc_comm testproc_arg_str testproc1_pid testproc2_pid topdir
 
-    set testproc_realpath "${topdir}/lib/test_process"
+    set testproc_realpath "${topdir}/src/tests/test_process"
     set testproc_comm "spcorp"
 
     set testproc_path [ exec mktemp -u ]
@@ -189,7 +189,7 @@ proc make_testproc { } {
 proc make_testshm_proc { } {
     global testshmproc_pid testshm_spawnid topdir shmid
 
-    set testshm_realpath "${topdir}/lib/test_shm"
+    set testshm_realpath "${topdir}/src/tests/test_shm"
 
     set testshmproc_pid [ spawn $testshm_realpath ]
     set testshmproc_spawnid $spawn_id

diff --git a/testsuite/lib.test/fileutils.exp b/testsuite/lib.test/fileutils.exp
index 0f246c6a4b4bf0a123d200eb6873f2b6d13e037f..3eaf654b6fdff5922a6226a769c26d0059f0be0a 100644 (file)
--- a/testsuite/lib.test/fileutils.exp
+++ b/testsuite/lib.test/fileutils.exp
@@ -2,7 +2,7 @@
 # Testsuite for lib/fileutils program
 #
 
-set noarg "${topdir}lib/test_fileutils"
+set noarg "${topdir}src/tests/test_fileutils"
 
 set test "without argument"
 spawn $noarg

diff --git a/testsuite/lib.test/fileutils_badfd.sh b/testsuite/lib.test/fileutils_badfd.sh
index 19a1310598f19bfa6da437bc720a49f976566e59..12c5b83bf6e1ac0448da938cfb02e19b72b3b7b4 100755 (executable)
--- a/testsuite/lib.test/fileutils_badfd.sh
+++ b/testsuite/lib.test/fileutils_badfd.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${PWD}/../lib/test_fileutils >&-
+${PWD}/../src/tests/test_fileutils >&-

diff --git a/testsuite/lib.test/fileutils_full.sh b/testsuite/lib.test/fileutils_full.sh
index 550e581e329fbb64bfc1bbd3cbb579e8079edeef..ea9b55ad16a6946040733793c3c1a23c2073fbac 100755 (executable)
--- a/testsuite/lib.test/fileutils_full.sh
+++ b/testsuite/lib.test/fileutils_full.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-${PWD}/../lib/test_fileutils > /dev/full
+${PWD}/../src/tests/test_fileutils > /dev/full

diff --git a/testsuite/lib.test/strutils.exp b/testsuite/lib.test/strutils.exp
index 7afa8f78aad3e0bfb40ae3d88f6cd0b443a0895b..72d1fcda335947313e95d4b02f9ea267aa6b2d4c 100644 (file)
--- a/testsuite/lib.test/strutils.exp
+++ b/testsuite/lib.test/strutils.exp
@@ -2,7 +2,7 @@
 # Testsuite for lib/strutils program
 #
 
-set teststr "${topdir}lib/test_strutils"
+set teststr "${topdir}src/tests/test_strutils"
 
 set test "without argument"
 spawn $teststr