Merge pull request #189 from darrenldl/dev

Fixed corrupt function in test suite
darrenldl · May 6, 2019 · 4a5f835 · 4a5f835
2 parents 19494b9 + ff1688d
commit 4a5f835
Show file tree

Hide file tree

Showing 44 changed files with 60 additions and 126 deletions.
diff --git a/tests/burst_corruption_tests.sh b/tests/burst_corruption_tests.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$4 bs=$2 count=$3 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/burst_corruption_tests_decode_stdout.sh b/tests/burst_corruption_tests_decode_stdout.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$4 bs=$2 count=$3 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/burst_corruption_tests_encode_stdin.sh b/tests/burst_corruption_tests_encode_stdin.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$4 bs=$2 count=$3 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/check_from_to_force_misalign.sh b/tests/check_from_to_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/check_from_to_rounding.sh b/tests/check_from_to_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/check_from_to_tests.sh b/tests/check_from_to_tests.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 echo -n "Encoding"
 output=$(./../blkar encode --json -f dummy --uid DEADBEEF0001)

diff --git a/tests/check_ref_from_to_tests.sh b/tests/check_ref_from_to_tests.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/check_ref_from_to_tests_force_misalign.sh b/tests/check_ref_from_to_tests_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/check_ref_from_to_tests_rounding.sh b/tests/check_ref_from_to_tests_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/compare_decode_file_and_stdout_corrupted_container.sh b/tests/compare_decode_file_and_stdout_corrupted_container.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(1 2 3 17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/compare_decode_file_and_stdout_nometa.sh b/tests/compare_decode_file_and_stdout_nometa.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(1 2 3 17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/corruption_tests.sh b/tests/corruption_tests.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/corruption_tests_decode_stdout.sh b/tests/corruption_tests_decode_stdout.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/corruption_tests_encode_stdin.sh b/tests/corruption_tests_encode_stdin.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-    dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/decode_blanks.sh b/tests/decode_blanks.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 echo "Testing version 1"
 echo "Encoding"

diff --git a/tests/decode_blanks_decode_stdout.sh b/tests/decode_blanks_decode_stdout.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 echo "Testing version 1"
 echo "Encoding"

diff --git a/tests/decode_from_to_tests.sh b/tests/decode_from_to_tests.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/decode_from_to_tests_corruption_based.sh b/tests/decode_from_to_tests_corruption_based.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 echo -n "Encoding"
 output=$(./../blkar encode --json -f dummy --uid DEADBEEF0001 --sbx-version 17 --rs-data 10 --rs-parity 2 --burst 10)

diff --git a/tests/decode_from_to_tests_corruption_based_force_misalign.sh b/tests/decode_from_to_tests_corruption_based_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_from_to_tests_corruption_based_rounding.sh b/tests/decode_from_to_tests_corruption_based_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_from_to_tests_decode_stdout.sh b/tests/decode_from_to_tests_decode_stdout.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 echo "Testing version 1"
 echo "Encoding"

diff --git a/tests/decode_from_to_tests_decode_stdout_force_misalign.sh b/tests/decode_from_to_tests_decode_stdout_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_from_to_tests_decode_stdout_rounding.sh b/tests/decode_from_to_tests_decode_stdout_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_from_to_tests_force_misalign.sh b/tests/decode_from_to_tests_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_from_to_tests_rounding.sh b/tests/decode_from_to_tests_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_multi_pass.sh b/tests/decode_multi_pass.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(1 2 3 17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/decode_multi_pass_no_skip.sh b/tests/decode_multi_pass_no_skip.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(1 2 3 17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/decode_ref_from_to_tests.sh b/tests/decode_ref_from_to_tests.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_ref_from_to_tests_force_misalign.sh b/tests/decode_ref_from_to_tests_force_misalign.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/decode_ref_from_to_tests_rounding.sh b/tests/decode_ref_from_to_tests_rounding.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 offset=$[1 + RANDOM % 100]
 

diff --git a/tests/dev_tests.sh b/tests/dev_tests.sh
@@ -56,6 +56,7 @@ while (( $i < $test_count )); do
       mkdir $t/
       cd $t
       ./../gen_dummy.sh
+      cp ../functions.sh .
       ./../$t.sh > log 2> stderr_log &
       cd ..
 

diff --git a/tests/encode_from_to_tests.sh b/tests/encode_from_to_tests.sh
@@ -2,9 +2,7 @@
 
 exit_code=0
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 for (( i=0; i < 10; i++ )); do
   from=$[RANDOM % 1000]

diff --git a/tests/functions.sh b/tests/functions.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+corrupt() {
+    byte_orig=$(mktemp)
+    byte_cur=$(mktemp)
+    dd if=$2 of=$byte_orig bs=1 count=1 skip=$1 &>/dev/null
+    while true; do
+        dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
+        dd if=$2 of=$byte_cur bs=1 count=1 skip=$1 &>/dev/null
+        cmp $byte_cur $byte_orig &>/dev/null
+        if [[ $? != 0 ]]; then
+            break
+        fi
+    done
+    rm $byte_orig
+    rm $byte_cur
+}
diff --git a/tests/repair_manual_burst.sh b/tests/repair_manual_burst.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/repair_manual_burst_decode_stdout.sh b/tests/repair_manual_burst_decode_stdout.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')
 

diff --git a/tests/repair_manual_burst_encode_stdin.sh b/tests/repair_manual_burst_encode_stdin.sh
@@ -4,9 +4,7 @@ exit_code=0
 
 VERSIONS=(17 18 19)
 
-corrupt() {
-  dd if=/dev/zero of=$2 bs=1 count=1 seek=$1 conv=notrunc &>/dev/null
-}
+source functions.sh
 
 file_size=$(ls -l dummy | awk '{ print $5 }')