emo
/
procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

build-sys: Update tests to new binary locations

This commit is contained in:
Craig Small 2022-08-29 19:13:10 +10:00
parent 3d0871728b
commit 56db0bd32c
17 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/config/unix.exp
View File

@ -16,7 +16,7 @@ proc kill_process pid {
proc procps_v_version { tool } { proc procps_v_version { tool } {
global topdir global topdir
set toolpath ${topdir}${tool} set toolpath ${topdir}src/${tool}
set tmp [ exec $toolpath -V ] set tmp [ exec $toolpath -V ]
regexp "from procps-ng (\[0-9.\]*)" $tmp tmp version regexp "from procps-ng (\[0-9.\]*)" $tmp tmp version
clone_output "$toolpath version $version\n" clone_output "$toolpath version $version\n"

2
testsuite/free.test/free.exp
View File

@ -2,7 +2,7 @@
# Testsuite for free program # Testsuite for free program
# #
set free "${topdir}free" set free "${topdir}src/free"
set meminfo [ exec cat /proc/meminfo ] set meminfo [ exec cat /proc/meminfo ]
regexp "MemTotal:\\s+\(\\d+\)" $meminfo -> memtotal_kb regexp "MemTotal:\\s+\(\\d+\)" $meminfo -> memtotal_kb
regexp "SwapTotal:\\s+\(\\d+\)" $meminfo -> swaptotal_kb regexp "SwapTotal:\\s+\(\\d+\)" $meminfo -> swaptotal_kb

2
testsuite/kill.test/kill.exp
View File

@ -1,7 +1,7 @@
# #
# Dejagnu testsuite for kill - part of procps # Dejagnu testsuite for kill - part of procps
# #
set kill ${topdir}kill set kill ${topdir}src/kill
if { ![ file exists $kill ] } { if { ![ file exists $kill ] } {
untested { skipping (not build)} untested { skipping (not build)}

4
testsuite/pgrep.test/pgrep.exp
View File

@ -3,12 +3,12 @@
# #
set mypid [pid] set mypid [pid]
set not_ppid [ expr { $mypid + 1 } ] set not_ppid [ expr { $mypid + 1 } ]
set pgrep "${topdir}pgrep" set pgrep "${topdir}src/pgrep"
set uid [ exec id -u ] set uid [ exec id -u ]
set not_uid [ expr { $uid + 1 } ] set not_uid [ expr { $uid + 1 } ]
set gid [ exec id -g ] set gid [ exec id -g ]
set not_gid [ expr { $gid + 1 } ] set not_gid [ expr { $gid + 1 } ]
set ps "${topdir}ps/pscommand" set ps "${topdir}src/ps/pscommand"
set tty [ get_tty ] set tty [ get_tty ]
set test "pgprep with no arguments" set test "pgprep with no arguments"

4
testsuite/pkill.test/pkill.exp
View File

@ -3,12 +3,12 @@
# #
set mypid [pid] set mypid [pid]
set not_ppid [ expr { $mypid + 1 } ] set not_ppid [ expr { $mypid + 1 } ]
set pkill "${topdir}pkill" set pkill "${topdir}src/pkill"
set uid [ exec id -u ] set uid [ exec id -u ]
set not_uid [ expr { $uid + 1 } ] set not_uid [ expr { $uid + 1 } ]
set gid [ exec id -g ] set gid [ exec id -g ]
set not_gid [ expr { $gid + 1 } ] set not_gid [ expr { $gid + 1 } ]
set ps "${topdir}ps/pscommand" set ps "${topdir}src/ps/pscommand"
set tty [ get_tty ] set tty [ get_tty ]
set test "pkill with no arguments" set test "pkill with no arguments"

2
testsuite/pmap.test/pmap.exp
View File

@ -1,7 +1,7 @@
# #
# Dejagnu tests for pgrep - part of procps # Dejagnu tests for pgrep - part of procps
# #
set pmap "${topdir}pmap" set pmap "${topdir}src/pmap"
set mypid [pid] set mypid [pid]
set pmap_procname "${mypid}:\\s+\\S+\[^\\r\]+\\s+" set pmap_procname "${mypid}:\\s+\\S+\[^\\r\]+\\s+"

2
testsuite/ps.test/ps_output.exp
View File

@ -1,7 +1,7 @@
# #
# Dejagnu tests for ps (output options) - part of procps # Dejagnu tests for ps (output options) - part of procps
# #
set ps ${topdir}ps/pscommand set ps ${topdir}src/ps/pscommand
set mypid [pid] set mypid [pid]
set not_ppid [ expr { $mypid + 1 } ] set not_ppid [ expr { $mypid + 1 } ]

2
testsuite/ps.test/ps_personality.exp
View File

@ -1,7 +1,7 @@
# #
# check the ps personalities # check the ps personalities
# #
set ps ${topdir}ps/pscommand set ps ${topdir}src/ps/pscommand
set pers_match { set pers_match {
bsd "\\s+PID\\s+TTY\\s+STAT\\s+TIME\\s+COMMAND\\r" bsd "\\s+PID\\s+TTY\\s+STAT\\s+TIME\\s+COMMAND\\r"

2
testsuite/ps.test/ps_sched_batch.exp
View File

@ -1,7 +1,7 @@
# #
# check the ps SCHED_BATCH scheduler policy output # 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" set schedbatch "${topdir}testsuite/test-schedbatch"
spawn $schedbatch 18 spawn $schedbatch 18

2
testsuite/pwait.test/pwait.exp
View File

@ -3,7 +3,7 @@
# #
set mypid [pid] set mypid [pid]
set not_ppid [ expr { $mypid + 1 } ] set not_ppid [ expr { $mypid + 1 } ]
set pwait "${topdir}pwait" set pwait "${topdir}src/pwait"
set uid [ exec id -u ] set uid [ exec id -u ]
set not_uid [ expr { $uid + 1 } ] set not_uid [ expr { $uid + 1 } ]
set gid [ exec id -g ] set gid [ exec id -g ]

2
testsuite/pwdx.test/pwdx.exp
View File

@ -1,7 +1,7 @@
make_testproc make_testproc
set pwdx "${topdir}pwdx" set pwdx "${topdir}src/pwdx"
# Run pwdx with no arguments # Run pwdx with no arguments
set test "pwdx no args" set test "pwdx no args"
spawn $pwdx spawn $pwdx

2
testsuite/slabtop.test/slabtop.exp
View File

@ -1,7 +1,7 @@
# #
# Dehagnu testing for slabtop - part of procps # Dehagnu testing for slabtop - part of procps
# #
set slabtop ${topdir}slabtop set slabtop ${topdir}src/slabtop
set avst "Active / Total" set avst "Active / Total"
set used "\\\(% used\\\)\\s+:" set used "\\\(% used\\\)\\s+:"

2
testsuite/sysctl.test/sysctl_read.exp
View File

@ -1,7 +1,7 @@
# #
# Dejagnu tests for sysctl (read only) - part of procps # 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 hostname [ exec cat "/proc/sys/kernel/hostname" ]
set test "sysctl with no arguments" set test "sysctl with no arguments"

2
testsuite/sysctl.test/sysctl_write.exp
View File

@ -1,5 +1,5 @@
set sysctl ${topdir}sysctl set sysctl ${topdir}src/sysctl
set test "sysctl write from command line" set test "sysctl write from command line"
spawn $sysctl --dry-run kernel.hostname=procps-test spawn $sysctl --dry-run kernel.hostname=procps-test

2
testsuite/uptime.test/uptime.exp
View File

@ -1,7 +1,7 @@
# #
# Dejagnu tests for uptime - part of procps # Dejagnu tests for uptime - part of procps
# #
set uptime "${topdir}uptime" set uptime "${topdir}src/uptime"
set test "uptime" set test "uptime"
spawn $uptime spawn $uptime

2
testsuite/vmstat.test/vmstat.exp
View File

@ -2,7 +2,7 @@
# #
# Dejagnu tests for vmstat - part of procps # Dejagnu tests for vmstat - part of procps
set vmstat "${topdir}vmstat" set vmstat "${topdir}src/vmstat"
# Tests that need to see /proc/vmstat # Tests that need to see /proc/vmstat
if { [ file readable "/proc/vmstat" ] == 0 } { if { [ file readable "/proc/vmstat" ] == 0 } {

2
testsuite/w.test/w.exp
View File

@ -2,7 +2,7 @@
# Dejagnu tests for w - part of procps # Dejagnu tests for w - part of procps
# #
# FIXME - the user lines only go to idle # 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_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+" set w_std_header "${w_uptime}USER\\s+TTY\\s+LOGIN@\\s+IDLE\\s+JCPU\\s+PCPU\\s+WHAT\\s+"