build-sys: Update tests to new binary locations
This commit is contained in:
parent
3d0871728b
commit
56db0bd32c
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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)}
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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+"
|
||||
|
@ -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 } ]
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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 ]
|
||||
|
@ -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
|
||||
|
@ -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+:"
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 } {
|
||||
|
@ -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+"
|
||||
|
Loading…
Reference in New Issue
Block a user