diff options
| author | Craig Small <csmall@dropbear.xyz> | 2022-08-29 20:40:45 +1000 |
|---|---|---|
| committer | Craig Small <csmall@dropbear.xyz> | 2022-08-29 20:40:45 +1000 |
| commit | 15a0a71406e0ac93b1451e479024cba136930328 (patch) | |
| tree | 9ab457f8b6edf13fc6d360736b55b0af8e929d4e | |
| parent | 1502648ff9aef047286db2e03a3e1a872d40a0e2 (diff) | |
| download | procps-ng-15a0a71406e0ac93b1451e479024cba136930328.tar.gz | |
testsuite: Update the library tests for new location
Signed-off-by: Craig Small <csmall@dropbear.xyz>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | testsuite/config/unix.exp | 6 | ||||
| -rw-r--r-- | testsuite/lib.test/fileutils.exp | 2 | ||||
| -rwxr-xr-x | testsuite/lib.test/fileutils_badfd.sh | 2 | ||||
| -rwxr-xr-x | testsuite/lib.test/fileutils_full.sh | 2 | ||||
| -rw-r--r-- | testsuite/lib.test/strutils.exp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 25f1a6a..9bb4148 100644 --- 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 66db9f1..ca73dda 100644 --- 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 0f246c6..3eaf654 100644 --- 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 19a1310..12c5b83 100755 --- 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 550e581..ea9b55a 100755 --- 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 7afa8f7..72d1fcd 100644 --- 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 |