diff options
| author | Craig Small <csmall@enc.com.au> | 2018-01-13 16:09:54 +1100 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2018-01-13 16:12:19 +1100 |
| commit | 233b5228be49d7118642cef83e779769dda1c6d4 (patch) | |
| tree | f1714c86374438c6c2938d72f50df4d968d124c7 /testsuite | |
| parent | ff700abc721b72110227818111653b5d9c0fd5a4 (diff) | |
| download | procps-ng-233b5228be49d7118642cef83e779769dda1c6d4.tar.gz | |
free: Update tests and fix for previous patch
The previous two patches updated free, but needed a tweak and the tests
also needed to be updated. I've hand-calculated the results using bc and
both the testsuite and bc results equal what free prints out.
References:
commit 9365be7633d23a68837868875c7b157516cd3058
procps-ng/procps#45
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/free.test/free.exp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/free.test/free.exp b/testsuite/free.test/free.exp index 83e197e..d019eb4 100644 --- a/testsuite/free.test/free.exp +++ b/testsuite/free.test/free.exp @@ -19,12 +19,12 @@ set swaptotal [ expr { $swaptotal_kb * 1024 } ] spawn $free -b expect_pass "$test" "^${free_header}Mem:\\s+${memtotal}\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*" -foreach {arg divisor } {-k 1 -m 1024 -g 1048576 --mega 1000 --giga 1000000 } { +foreach {arg divisor } {-k 1024 -m 1048576 -g 1073741824 --kilo 1000 --mega 1000000 --giga 1000000000 } { set test "free with $arg argument" - set memtotal [ expr { $memtotal_kb / $divisor } ] - set swaptotal [ expr { $swaptotal_kb / $divisor } ] + set memtest [ expr { $memtotal / $divisor } ] + set swaptest [ expr { $swaptotal / $divisor } ] spawn $free $arg - expect_pass "$test" "^${free_header}Mem:\\s+$memtotal\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptotal}\\s+\\d+\\s+\\d+\\s*" + expect_pass "$test" "^${free_header}Mem:\\s+$memtest\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s+\\d+\\s*Swap:\\s+${swaptest}\\s+\\d+\\s+\\d+\\s*" } #set test "free with human readable output" |