|
 |
aaccc6 |
From 9f37f5d29f255285cbc7822788963681a8f659dd Mon Sep 17 00:00:00 2001
|
|
|
aaccc6 |
From: rpm-build <rpm-build>
|
|
|
aaccc6 |
Date: Tue, 26 Jan 2021 15:22:57 -0500
|
|
|
aaccc6 |
Subject: [PATCH] test: use a power of 2 for file sizes
|
|
|
aaccc6 |
|
|
|
aaccc6 |
Reduce the change of tests failing due to block size round-up.
|
|
|
aaccc6 |
Freebsd was failing that way.
|
|
|
aaccc6 |
|
|
|
aaccc6 |
Upstream: https://github.com/chaos/scrub/commit/5c66fc0537f4ecb21d4c3dcdd9020a02c8a2d819
|
|
|
aaccc6 |
---
|
|
|
aaccc6 |
test/t02 | 2 +-
|
|
|
aaccc6 |
test/t02.exp | 2 +-
|
|
|
aaccc6 |
test/t03 | 2 +-
|
|
|
aaccc6 |
test/t03.exp | 2 +-
|
|
|
aaccc6 |
test/t04 | 2 +-
|
|
|
aaccc6 |
test/t04.exp | 2 +-
|
|
|
aaccc6 |
test/t05 | 2 +-
|
|
|
aaccc6 |
test/t05.exp | 2 +-
|
|
|
aaccc6 |
test/t06 | 2 +-
|
|
|
aaccc6 |
test/t06.exp | 2 +-
|
|
|
aaccc6 |
test/t07 | 2 +-
|
|
|
aaccc6 |
test/t11 | 2 +-
|
|
|
aaccc6 |
test/t11.exp | 2 +-
|
|
|
aaccc6 |
test/t12 | 8 ++++----
|
|
|
aaccc6 |
test/t12.exp | 12 ++++++------
|
|
|
aaccc6 |
15 files changed, 23 insertions(+), 23 deletions(-)
|
|
|
aaccc6 |
|
|
|
aaccc6 |
diff --git a/test/t02 b/test/t02
|
|
|
aaccc6 |
index d09a517..14c5ca7 100755
|
|
|
aaccc6 |
--- a/test/t02
|
|
|
aaccc6 |
+++ b/test/t02
|
|
|
aaccc6 |
@@ -1,6 +1,6 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r $TESTFILE 2>&1 | sed -e "s!${TESTFILE}!file!" >t02.out || exit 1
|
|
|
aaccc6 |
diff t02.exp t02.out >t02.diff
|
|
|
aaccc6 |
diff --git a/test/t02.exp b/test/t02.exp
|
|
|
aaccc6 |
index 848c9b7..e026a17 100644
|
|
|
aaccc6 |
--- a/test/t02.exp
|
|
|
aaccc6 |
+++ b/test/t02.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using NNSA NAP-14.1-C patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
diff --git a/test/t03 b/test/t03
|
|
|
aaccc6 |
index db9ca61..917ec52 100755
|
|
|
aaccc6 |
--- a/test/t03
|
|
|
aaccc6 |
+++ b/test/t03
|
|
|
aaccc6 |
@@ -1,6 +1,6 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r -p dod $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t03.out || exit 1
|
|
|
aaccc6 |
diff t03.exp t03.out >t03.diff
|
|
|
aaccc6 |
diff --git a/test/t03.exp b/test/t03.exp
|
|
|
aaccc6 |
index e7e8015..4456149 100644
|
|
|
aaccc6 |
--- a/test/t03.exp
|
|
|
aaccc6 |
+++ b/test/t03.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using DoD 5220.22-M patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: 0xff |................................................|
|
|
|
aaccc6 |
diff --git a/test/t04 b/test/t04
|
|
|
aaccc6 |
index 3dd4165..a33e9cd 100755
|
|
|
aaccc6 |
--- a/test/t04
|
|
|
aaccc6 |
+++ b/test/t04
|
|
|
aaccc6 |
@@ -1,6 +1,6 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r -p bsi $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t04.out || exit 1
|
|
|
aaccc6 |
diff t04.exp t04.out >t04.diff
|
|
|
aaccc6 |
diff --git a/test/t04.exp b/test/t04.exp
|
|
|
aaccc6 |
index 2bb6822..ac98d54 100644
|
|
|
aaccc6 |
--- a/test/t04.exp
|
|
|
aaccc6 |
+++ b/test/t04.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using BSI patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: 0xff |................................................|
|
|
|
aaccc6 |
scrub: 0xfe |................................................|
|
|
|
aaccc6 |
scrub: 0xfd |................................................|
|
|
|
aaccc6 |
diff --git a/test/t05 b/test/t05
|
|
|
aaccc6 |
index 474fcd3..d9a6061 100755
|
|
|
aaccc6 |
--- a/test/t05
|
|
|
aaccc6 |
+++ b/test/t05
|
|
|
aaccc6 |
@@ -1,6 +1,6 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r -p fastold $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t05.out || exit 1
|
|
|
aaccc6 |
diff t05.exp t05.out >t05.diff
|
|
|
aaccc6 |
diff --git a/test/t05.exp b/test/t05.exp
|
|
|
aaccc6 |
index 48ba9b7..118d7e4 100644
|
|
|
aaccc6 |
--- a/test/t05.exp
|
|
|
aaccc6 |
+++ b/test/t05.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using pre v1.7 scrub (skip random) patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: 0xff |................................................|
|
|
|
aaccc6 |
scrub: 0xaa |................................................|
|
|
|
aaccc6 |
diff --git a/test/t06 b/test/t06
|
|
|
aaccc6 |
index 28eb856..48bde5a 100755
|
|
|
aaccc6 |
--- a/test/t06
|
|
|
aaccc6 |
+++ b/test/t06
|
|
|
aaccc6 |
@@ -1,7 +1,7 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r -p old $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t06.out || exit 1
|
|
|
aaccc6 |
diff t06.exp t06.out >t06.diff
|
|
|
aaccc6 |
rc=$?
|
|
|
aaccc6 |
diff --git a/test/t06.exp b/test/t06.exp
|
|
|
aaccc6 |
index 49967ec..e84360a 100644
|
|
|
aaccc6 |
--- a/test/t06.exp
|
|
|
aaccc6 |
+++ b/test/t06.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using pre v1.7 scrub patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: 0xff |................................................|
|
|
|
aaccc6 |
scrub: 0xaa |................................................|
|
|
|
aaccc6 |
diff --git a/test/t07 b/test/t07
|
|
|
aaccc6 |
index cb935bf..69eab76 100755
|
|
|
aaccc6 |
--- a/test/t07
|
|
|
aaccc6 |
+++ b/test/t07
|
|
|
aaccc6 |
@@ -1,7 +1,7 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE
|
|
|
aaccc6 |
+./pad 512k $TESTFILE
|
|
|
aaccc6 |
(./tsig $TESTFILE && ./tsig $TESTFILE) >t07.out 2>&1
|
|
|
aaccc6 |
diff t07.exp t07.out >t07.diff
|
|
|
aaccc6 |
rc=$?
|
|
|
aaccc6 |
diff --git a/test/t11 b/test/t11
|
|
|
aaccc6 |
index 5a17b46..dd5444f 100755
|
|
|
aaccc6 |
--- a/test/t11
|
|
|
aaccc6 |
+++ b/test/t11
|
|
|
aaccc6 |
@@ -1,7 +1,7 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
$PATH_SCRUB -r -p gutmann $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t11.out || exit 1
|
|
|
aaccc6 |
diff t11.exp t11.out >t11.diff
|
|
|
aaccc6 |
rc=$?
|
|
|
aaccc6 |
diff --git a/test/t11.exp b/test/t11.exp
|
|
|
aaccc6 |
index abd2abf..895d903 100644
|
|
|
aaccc6 |
--- a/test/t11.exp
|
|
|
aaccc6 |
+++ b/test/t11.exp
|
|
|
aaccc6 |
@@ -1,5 +1,5 @@
|
|
|
aaccc6 |
scrub: using Gutmann patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
diff --git a/test/t12 b/test/t12
|
|
|
aaccc6 |
index c312220..260198f 100755
|
|
|
aaccc6 |
--- a/test/t12
|
|
|
aaccc6 |
+++ b/test/t12
|
|
|
aaccc6 |
@@ -1,14 +1,14 @@
|
|
|
aaccc6 |
#!/bin/sh
|
|
|
aaccc6 |
TESTFILE=${TMPDIR:-/tmp}/scrub-testfile.$$
|
|
|
aaccc6 |
rm -f $TESTFILE
|
|
|
aaccc6 |
-./pad 400k $TESTFILE || exit 1
|
|
|
aaccc6 |
-$PATH_SCRUB -s 400k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t12.out
|
|
|
aaccc6 |
+./pad 512k $TESTFILE || exit 1
|
|
|
aaccc6 |
+$PATH_SCRUB -s 512k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >t12.out
|
|
|
aaccc6 |
test $? = 0 || exit 1
|
|
|
aaccc6 |
./tsize $TESTFILE >>t12.out 2>&1
|
|
|
aaccc6 |
-$PATH_SCRUB -f -s 300k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >>t12.out
|
|
|
aaccc6 |
+$PATH_SCRUB -f -s 256k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >>t12.out
|
|
|
aaccc6 |
test $? = 0 || exit 1
|
|
|
aaccc6 |
./tsize $TESTFILE >>t12.out 2>&1
|
|
|
aaccc6 |
-$PATH_SCRUB -f -s 500k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >>t12.out
|
|
|
aaccc6 |
+$PATH_SCRUB -f -s 1024k $TESTFILE 2>&1 | sed -e "s!$TESTFILE!file!" >>t12.out
|
|
|
aaccc6 |
test $? = 0 || exit 1
|
|
|
aaccc6 |
./tsize $TESTFILE >>t12.out 2>&1
|
|
|
aaccc6 |
diff t12.exp t12.out >t12.diff
|
|
|
aaccc6 |
diff --git a/test/t12.exp b/test/t12.exp
|
|
|
aaccc6 |
index 33f2c97..4c5d987 100644
|
|
|
aaccc6 |
--- a/test/t12.exp
|
|
|
aaccc6 |
+++ b/test/t12.exp
|
|
|
aaccc6 |
@@ -1,22 +1,22 @@
|
|
|
aaccc6 |
scrub: using NNSA NAP-14.1-C patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 409600 bytes (~400KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 524288 bytes (~512KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: verify |................................................|
|
|
|
aaccc6 |
-409600
|
|
|
aaccc6 |
+524288
|
|
|
aaccc6 |
scrub: warning: -s size < file size
|
|
|
aaccc6 |
scrub: using NNSA NAP-14.1-C patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 307200 bytes (~300KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 262144 bytes (~256KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: verify |................................................|
|
|
|
aaccc6 |
-409600
|
|
|
aaccc6 |
+524288
|
|
|
aaccc6 |
scrub: using NNSA NAP-14.1-C patterns
|
|
|
aaccc6 |
-scrub: scrubbing file 512000 bytes (~500KB)
|
|
|
aaccc6 |
+scrub: scrubbing file 1048576 bytes (~1024KB)
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: random |................................................|
|
|
|
aaccc6 |
scrub: 0x00 |................................................|
|
|
|
aaccc6 |
scrub: verify |................................................|
|
|
|
aaccc6 |
-512000
|
|
|
aaccc6 |
+1048576
|
|
|
aaccc6 |
--
|
|
|
aaccc6 |
2.27.0
|
|
|
aaccc6 |
|