build-sys: Update tests to new binary locations

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 2590f95b3539a285bf45140a5c23ce64e1ac0e10..66db9f1f08d543eb5d07cc22c51288f931ddf3bc 100644 (file)
--- 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 332fa9d9175634a083e0489b267bd28823ad8daa..2eae3dfb72a36ff1a4cb75df16dd38ac21d5403d 100644 (file)
--- 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 5aa7b2c98609f448875866e5bccd359d7773eaa6..49bac9661c1f851304297e469ea92e7710e89d5e 100644 (file)
--- 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 3a3e1e1a79b8cd68b436155d83a51ced76f27920..e57e044df5997884c6fbd9afa2d8e9d354cd5f6c 100644 (file)
--- 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 573df6ebe97c1d1d94d299fc4e3aeb88d51bb9f1..ba643545c03f8df3bf9ce9ccc5d12cc5802929a8 100644 (file)
--- 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 1622cea635929591700504440cb131c5d59d3b2b..3da0facfd5f84d7d265e1650d318765cc899135b 100644 (file)
--- 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 7df7b0e7aa5cbd9507efd601058ded3775490e71..998490e5b82c5aa80046fc3dd98e78427729b2f2 100644 (file)
--- 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 1127f1e571726ea1f704022a9993644932154ff8..74b163f87011c82bc3d80c26bb12b48c28c0a603 100644 (file)
--- 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 3266e5ada558b90e098ffc8d769fe2786e1b9c94..ff948db2b10652c661acd3ecb431e615f5234c6f 100644 (file)
--- 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 0b59a9533ddca7abd22282cad31fd589ac53bbe3..5ec6bed6ae3d5a08e7d737827d09ba5d305189b3 100644 (file)
--- 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 39d95831bf3bd53bf7b66cd718274e172be7ee22..2f71cbd8dfd261d912e87ca69aabe870e1e351ce 100644 (file)
--- 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 ec43d072c024cd502bd1e3de1f53dfb90fa9ca12..b3f93963f087134a4ea48bed87edb79b9767555e 100644 (file)
--- 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 84d1742aee89304a70e99987b83a590185b130fd..c55cd95fe6238c9df83c0c8d77f8bb5c526ba0dd 100644 (file)
--- 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 b6b944361f0b4b5939e0d1fe1d028b4b09f5d4dd..17b3079a9f7edd711e37b2544eb80b08596ddbab 100644 (file)
--- 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 c6f51e2ea431b18e1037fd835947ad500ff1a4e9..f832a77ce86be836fa71ec6aaf9c792ade8c0b1e 100644 (file)
--- 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 cd55e529d8347a4868c5473f5d3065bd36d16bbe..1cd13a1571942e333b20d2aa8b2c07b39bda2504 100644 (file)
--- 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 8fd744bda186097a5a8128cff74805128082341f..5f1064d78f004d9d806c2f94f8685b6110e10e44 100644 (file)
--- 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+"