From 56db0bd32c1b92b33e5af24f2c8c602589ab8154 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@dropbear.xyz>
Date: Mon, 29 Aug 2022 19:13:10 +1000
Subject: [PATCH] build-sys: Update tests to new binary locations

---
 testsuite/config/unix.exp              | 2 +-
 testsuite/free.test/free.exp           | 2 +-
 testsuite/kill.test/kill.exp           | 2 +-
 testsuite/pgrep.test/pgrep.exp         | 4 ++--
 testsuite/pkill.test/pkill.exp         | 4 ++--
 testsuite/pmap.test/pmap.exp           | 2 +-
 testsuite/ps.test/ps_output.exp        | 2 +-
 testsuite/ps.test/ps_personality.exp   | 2 +-
 testsuite/ps.test/ps_sched_batch.exp   | 2 +-
 testsuite/pwait.test/pwait.exp         | 2 +-
 testsuite/pwdx.test/pwdx.exp           | 2 +-
 testsuite/slabtop.test/slabtop.exp     | 2 +-
 testsuite/sysctl.test/sysctl_read.exp  | 2 +-
 testsuite/sysctl.test/sysctl_write.exp | 2 +-
 testsuite/uptime.test/uptime.exp       | 2 +-
 testsuite/vmstat.test/vmstat.exp       | 2 +-
 testsuite/w.test/w.exp                 | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 2590f95b..66db9f1f 100644
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -16,7 +16,7 @@ proc kill_process pid {
 
 proc procps_v_version { tool } {
   global topdir
-  set toolpath ${topdir}${tool}
+  set toolpath ${topdir}src/${tool}
   set tmp [ exec $toolpath -V ]
   regexp "from procps-ng (\[0-9.\]*)" $tmp tmp version
   clone_output "$toolpath version $version\n"
diff --git a/testsuite/free.test/free.exp b/testsuite/free.test/free.exp
index 332fa9d9..2eae3dfb 100644
--- a/testsuite/free.test/free.exp
+++ b/testsuite/free.test/free.exp
@@ -2,7 +2,7 @@
 # Testsuite for free program
 #
 
-set free "${topdir}free"
+set free "${topdir}src/free"
 set meminfo [ exec cat /proc/meminfo ]
 regexp "MemTotal:\\s+\(\\d+\)" $meminfo -> memtotal_kb
 regexp "SwapTotal:\\s+\(\\d+\)" $meminfo -> swaptotal_kb
diff --git a/testsuite/kill.test/kill.exp b/testsuite/kill.test/kill.exp
index 5aa7b2c9..49bac966 100644
--- a/testsuite/kill.test/kill.exp
+++ b/testsuite/kill.test/kill.exp
@@ -1,7 +1,7 @@
 #
 # Dejagnu testsuite for kill - part of procps
 #
-set kill ${topdir}kill
+set kill ${topdir}src/kill
 
 if { ![ file exists $kill ] } {
     untested { skipping (not build)}
diff --git a/testsuite/pgrep.test/pgrep.exp b/testsuite/pgrep.test/pgrep.exp
index 3a3e1e1a..e57e044d 100644
--- a/testsuite/pgrep.test/pgrep.exp
+++ b/testsuite/pgrep.test/pgrep.exp
@@ -3,12 +3,12 @@
 #
 set mypid [pid]
 set not_ppid [ expr { $mypid + 1 } ]
-set pgrep "${topdir}pgrep"
+set pgrep "${topdir}src/pgrep"
 set uid [ exec id -u ]
 set not_uid [ expr { $uid + 1 } ] 
 set gid [ exec id -g ]
 set not_gid [ expr { $gid + 1 } ] 
-set ps "${topdir}ps/pscommand"
+set ps "${topdir}src/ps/pscommand"
 set tty [ get_tty ]
 
 set test "pgprep with no arguments"
diff --git a/testsuite/pkill.test/pkill.exp b/testsuite/pkill.test/pkill.exp
index 573df6eb..ba643545 100644
--- a/testsuite/pkill.test/pkill.exp
+++ b/testsuite/pkill.test/pkill.exp
@@ -3,12 +3,12 @@
 #
 set mypid [pid]
 set not_ppid [ expr { $mypid + 1 } ]
-set pkill "${topdir}pkill"
+set pkill "${topdir}src/pkill"
 set uid [ exec id -u ]
 set not_uid [ expr { $uid + 1 } ] 
 set gid [ exec id -g ]
 set not_gid [ expr { $gid + 1 } ] 
-set ps "${topdir}ps/pscommand"
+set ps "${topdir}src/ps/pscommand"
 set tty [ get_tty ]
 
 set test "pkill with no arguments"
diff --git a/testsuite/pmap.test/pmap.exp b/testsuite/pmap.test/pmap.exp
index 1622cea6..3da0facf 100644
--- a/testsuite/pmap.test/pmap.exp
+++ b/testsuite/pmap.test/pmap.exp
@@ -1,7 +1,7 @@
 #
 # Dejagnu tests for pgrep - part of procps
 #
-set pmap "${topdir}pmap"
+set pmap "${topdir}src/pmap"
 set mypid [pid]
 
 set pmap_procname "${mypid}:\\s+\\S+\[^\\r\]+\\s+"
diff --git a/testsuite/ps.test/ps_output.exp b/testsuite/ps.test/ps_output.exp
index 7df7b0e7..998490e5 100644
--- a/testsuite/ps.test/ps_output.exp
+++ b/testsuite/ps.test/ps_output.exp
@@ -1,7 +1,7 @@
 #
 # Dejagnu tests for ps (output options) - part of procps
 #
-set ps ${topdir}ps/pscommand
+set ps ${topdir}src/ps/pscommand
 
 set mypid [pid]
 set not_ppid [ expr { $mypid + 1 } ]
diff --git a/testsuite/ps.test/ps_personality.exp b/testsuite/ps.test/ps_personality.exp
index 1127f1e5..74b163f8 100644
--- a/testsuite/ps.test/ps_personality.exp
+++ b/testsuite/ps.test/ps_personality.exp
@@ -1,7 +1,7 @@
 #
 # check the ps personalities
 #
-set ps ${topdir}ps/pscommand
+set ps ${topdir}src/ps/pscommand
 
 set pers_match { 
   bsd       "\\s+PID\\s+TTY\\s+STAT\\s+TIME\\s+COMMAND\\r"
diff --git a/testsuite/ps.test/ps_sched_batch.exp b/testsuite/ps.test/ps_sched_batch.exp
index 3266e5ad..ff948db2 100644
--- a/testsuite/ps.test/ps_sched_batch.exp
+++ b/testsuite/ps.test/ps_sched_batch.exp
@@ -1,7 +1,7 @@
 #
 # check the ps SCHED_BATCH scheduler policy output
 #
-set ps "${topdir}ps/pscommand"
+set ps "${topdir}src/ps/pscommand"
 set schedbatch "${topdir}testsuite/test-schedbatch"
 
 spawn $schedbatch 18
diff --git a/testsuite/pwait.test/pwait.exp b/testsuite/pwait.test/pwait.exp
index 0b59a953..5ec6bed6 100644
--- a/testsuite/pwait.test/pwait.exp
+++ b/testsuite/pwait.test/pwait.exp
@@ -3,7 +3,7 @@
 #
 set mypid [pid]
 set not_ppid [ expr { $mypid + 1 } ]
-set pwait "${topdir}pwait"
+set pwait "${topdir}src/pwait"
 set uid [ exec id -u ]
 set not_uid [ expr { $uid + 1 } ]
 set gid [ exec id -g ]
diff --git a/testsuite/pwdx.test/pwdx.exp b/testsuite/pwdx.test/pwdx.exp
index 39d95831..2f71cbd8 100644
--- a/testsuite/pwdx.test/pwdx.exp
+++ b/testsuite/pwdx.test/pwdx.exp
@@ -1,7 +1,7 @@
 
 make_testproc
 
-set pwdx "${topdir}pwdx"
+set pwdx "${topdir}src/pwdx"
 # Run pwdx with no arguments
 set test "pwdx no args"
 spawn $pwdx
diff --git a/testsuite/slabtop.test/slabtop.exp b/testsuite/slabtop.test/slabtop.exp
index ec43d072..b3f93963 100644
--- a/testsuite/slabtop.test/slabtop.exp
+++ b/testsuite/slabtop.test/slabtop.exp
@@ -1,7 +1,7 @@
 #
 # Dehagnu testing for slabtop - part of procps
 #
-set slabtop ${topdir}slabtop
+set slabtop ${topdir}src/slabtop
 
 set avst "Active / Total"
 set used "\\\(% used\\\)\\s+:"
diff --git a/testsuite/sysctl.test/sysctl_read.exp b/testsuite/sysctl.test/sysctl_read.exp
index 84d1742a..c55cd95f 100644
--- a/testsuite/sysctl.test/sysctl_read.exp
+++ b/testsuite/sysctl.test/sysctl_read.exp
@@ -1,7 +1,7 @@
 #
 # Dejagnu tests for sysctl (read only) - part of procps
 #
-set sysctl ${topdir}sysctl
+set sysctl ${topdir}src/sysctl
 set hostname [ exec cat "/proc/sys/kernel/hostname" ]
 
 set test "sysctl with no arguments"
diff --git a/testsuite/sysctl.test/sysctl_write.exp b/testsuite/sysctl.test/sysctl_write.exp
index b6b94436..17b3079a 100644
--- a/testsuite/sysctl.test/sysctl_write.exp
+++ b/testsuite/sysctl.test/sysctl_write.exp
@@ -1,5 +1,5 @@
 
-set sysctl ${topdir}sysctl
+set sysctl ${topdir}src/sysctl
 
 set test "sysctl write from command line"
 spawn $sysctl --dry-run kernel.hostname=procps-test
diff --git a/testsuite/uptime.test/uptime.exp b/testsuite/uptime.test/uptime.exp
index c6f51e2e..f832a77c 100644
--- a/testsuite/uptime.test/uptime.exp
+++ b/testsuite/uptime.test/uptime.exp
@@ -1,7 +1,7 @@
 #
 # Dejagnu tests for uptime - part of procps
 #
-set uptime "${topdir}uptime"
+set uptime "${topdir}src/uptime"
 
 set test "uptime"
 spawn $uptime
diff --git a/testsuite/vmstat.test/vmstat.exp b/testsuite/vmstat.test/vmstat.exp
index cd55e529..1cd13a15 100644
--- a/testsuite/vmstat.test/vmstat.exp
+++ b/testsuite/vmstat.test/vmstat.exp
@@ -2,7 +2,7 @@
 #
 # Dejagnu tests for vmstat - part of procps
 
-set vmstat "${topdir}vmstat"
+set vmstat "${topdir}src/vmstat"
 
 # Tests that need to see /proc/vmstat
 if { [ file readable "/proc/vmstat" ] == 0 } {
diff --git a/testsuite/w.test/w.exp b/testsuite/w.test/w.exp
index 8fd744bd..5f1064d7 100644
--- a/testsuite/w.test/w.exp
+++ b/testsuite/w.test/w.exp
@@ -2,7 +2,7 @@
 # Dejagnu tests for w - part of procps
 #
 # FIXME - the user lines only go to idle
-set w "${topdir}w"
+set w "${topdir}src/w"
 
 set w_uptime "\\s+\\d{2}:\\d{2}:\\d{2} up (\\d+ days?,)?\\s*\\d+( min|:\\d+), +\\d+ users?, +load average: \[0-9.\]+, \[0-9.\]+, \[0-9.\]+\\s+"
 set w_std_header "${w_uptime}USER\\s+TTY\\s+LOGIN@\\s+IDLE\\s+JCPU\\s+PCPU\\s+WHAT\\s+"