From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by sourceware.org (Postfix) with ESMTPS id C0EB13858D31 for ; Mon, 20 Apr 2020 18:13:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C0EB13858D31 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=mvista.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rahulk@mvista.com Received: by mail-pl1-x62c.google.com with SMTP id w3so4246466plz.5 for ; Mon, 20 Apr 2020 11:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mvista-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=8Ags7MeEvyxy5ewnjuMMUU6sIpATF9VurXUwavm0W4A=; b=Wa73SbAh7vOtfjfi7u0THR2Nk8G1ESIsdTpquTRP7slr6jom1sgl9EdHuOr9j3uwy3 kl+nlQqvNIRwb2GuaIVsV3ZjN5anhLFq3I+b8N14ukjrciOIWuaeBxir3EfMX3o127kT Z0rBTqOyqnWtOjKlYEU8aH5dqi5BV0xslNJ9cmthwI8lwUdLVRbdhG7Nsy+ZwyDJYahl PdiV5MfH/PO7xjCjnjHaFi2vSISoEsWhac1hIDBwErwk3FDE+kK9o11KmTY3rAE90iFi 9OkPOHu+pLXsXf4HQeGIgiawaXOIOrS2Wcsw5xCObBuWvrbFvBenwYlA7fMaTpxUxx96 QVCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8Ags7MeEvyxy5ewnjuMMUU6sIpATF9VurXUwavm0W4A=; b=OeDxZz0fnOO3+Pwqsua0dbb3MG4yEBeqjZ9+Ji5LNjKjZAemxPyTqOnImdzqfPC5VC lh6y6acLpvB+WBiGCENaGPIq9zq0kDfgUgWLNg8dJLEsvo7td12NJ8+4WVSRIF9vc7Tr hRMoIhpwXEBDHxUQQkvWSUJqyCDFZkNj+Y+rjXBk0tTo9lcUEd2kA5qUbNt1/yzpqUTv iaWzWDF8zeNq4yjOaRAKm171pIzEjc4RT3BUdccLZ6sdjSOeDuldBljzDd3+iZep1dhS nR+7ASe9LYYvjDlKTxKtivFlowZ7CeDotkYsQNomm3IM3qOqJ9qYXi1SjotGLuZj8je+ tyDw== X-Gm-Message-State: AGi0PuZ8wvDMmW4qMGFn1DAslReWsjOWVV3zRs5pCAWzDytLeeiXpFXI 8uxM+tjm1v6eGKEFEabsPFm2KQTck7E= X-Google-Smtp-Source: APiQypJ9EDjnioa7c2ktH9hjEpuz+Fx4roSz+F/otrFxEdhOmh3WoTnVQg0clqplD40S5mbCNfhqUg== X-Received: by 2002:a17:902:9a82:: with SMTP id w2mr17969899plp.117.1587406403313; Mon, 20 Apr 2020 11:13:23 -0700 (PDT) Received: from CelSys065.mvista.com ([36.255.87.194]) by smtp.gmail.com with ESMTPSA id t6sm145478pfh.98.2020.04.20.11.13.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2020 11:13:22 -0700 (PDT) From: Rahul Kumar To: bzip2-devel@sourceware.org Subject: [PATCH] bzip2: modify run-tests script Date: Mon, 20 Apr 2020 23:43:09 +0530 Message-Id: <1587406389-28634-1-git-send-email-rahulk@mvista.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: bzip2-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Bzip2-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2020 18:13:27 -0000 1) modify run-tests script to write PASS/FAIL as expected by the ptest infrastructure 2) Since the discrete md5sum does not have a short form of --status.And minimal base images does not support commands with long form arguments so dropping this argument Signed-off-by: Rahul Kumar --- run-tests.sh | 62 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/run-tests.sh b/run-tests.sh index 1ba8c27..771584d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -40,21 +40,21 @@ case $i in esac done -if ! type "valgrind" > /dev/null; then +if ! type "valgrind" > /dev/null 2>&1; then VALGRIND="" VALGRIND_ARGS="" fi echo "Testing ${BZIP2} in directory ${TESTS_DIR}" if [ "$VALGRIND" != "" ]; then - echo " using valgrind" + echo "Using valgrind: Yes" else - echo " NOT using valgrind" + echo "Using valgrind: No" fi if [[ ${IGNORE_MD5} -eq 0 ]]; then - echo " checking md5 sums" + echo "Checking md5 sums: Yes" else - echo " NOT checking md5 sums" + echo "Checking md5 sums: No" fi # Remove any left over tesfilecopies from previous runs first. @@ -78,14 +78,14 @@ while IFS= read -r -d '' bzfile; do # Decompress it. echo " Decompress..." rm -f "${file}" - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q ${bzfile} \ - || { echo "!!! bad decompress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q ${bzfile} && { echo "PASS: ${bzfile} Decompress"; } \ + || { echo "FAIL: ${bzfile} Decompress"; badtests=("${badtests[@]}" $"${bzfile} bad decompress result") nogood=$[${nogood}+1]; continue; } if [[ ${IGNORE_MD5} -ne 1 ]]; then - md5sum --check --status ${md5file} < ${file} \ - || { echo "!!! md5sum doesn't match decompressed file"; + md5sum -c ${md5file} < ${file} && { echo "PASS: ${bzfile} md5sum Matched"; } \ + || { echo "FAIL: ${bzfile} md5sum Matched"; badtests=("${badtests[@]}" $"${file} md5sum doesn't match") nogood=$[${nogood}+1]; continue; } fi @@ -94,19 +94,19 @@ while IFS= read -r -d '' bzfile; do mv "${file}" "${copy}" rm -f "${bzcopy}" echo " Recompress..." - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} \ - || { echo "!!! bad compress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} && { echo "PASS: ${bzfile} Recompress "; } \ + || { echo "FAIL: ${bzfile} Recompress"; badtests=("${badtests[@]}" $"${copy} bad result") nogood=$[${nogood}+1]; continue; } echo " Redecompress..." - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} \ - || { echo "!!! bad (re)decompress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} && { echo "PASS: ${bzfile} Redecompress"; } \ + || { echo "FAIL: ${bzfile} Redecompress"; badtests=("${badtests[@]}" $"${bzcopy} bad result") nogood=$[${nogood}+1]; continue; } if [[ ${IGNORE_MD5} -ne 1 ]]; then - md5sum --check --status ${md5file} < ${copy} \ - || { echo "!!! md5sum doesn't match (re)decompressed file"; + md5sum -c ${md5file} < ${copy} && { echo "PASS: ${bzfile} md5sum Matched"; } \ + || { echo "FAIL: ${bzfile} md5sum Matched"; badtests=("${badtests[@]}" $"${copy} md5sum doesn't match") nogood=$[${nogood}+1]; continue; } fi @@ -116,14 +116,14 @@ while IFS= read -r -d '' bzfile; do # Now do it all again in "small" mode. echo " Decompress (small)..." rm -f "${file}" - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q -s ${bzfile} \ - || { echo "!!! bad decompress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -k -d -q -s ${bzfile} &&{ echo "PASS: ${bzfile} Decompress (small)"; } \ + || { echo "FAIL: ${bzfile} Decompress (small)"; badtests=("${badtests[@]}" $"${bzfile} bad decompress result") nogood=$[${nogood}+1]; continue; } if [[ ${IGNORE_MD5} -ne 1 ]]; then - md5sum --check --status ${md5file} < ${file} \ - || { echo "!!! md5sum doesn't match decompressed file"; + md5sum -c ${md5file} < ${file} && { echo "PASS: ${bzfile} Md5sum Matched"; } \ + || { echo "FAIL: ${bzfile} Md5sum Matched"; badtests=("${badtests[@]}" $"${file} md5sum doesn't match") nogood=$[${nogood}+1]; continue; } fi @@ -132,19 +132,19 @@ while IFS= read -r -d '' bzfile; do mv "${file}" "${copy}" rm -f "${bzcopy}" echo " Recompress (small)..." - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} \ - || { echo "!!! bad compress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -z -q -s ${copy} && { echo "PASS: ${bzfile} Recompress (small)"; } \ + || { echo "FAIL: ${bzfile} Recompress (small)"; badtests=("${badtests[@]}" $"${copy} bad result") nogood=$[${nogood}+1]; continue; } echo " Redecompress (small)..." - ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} \ - || { echo "!!! bad (re)decompress result $?"; + ${VALGRIND} ${VALGRIND_ARGS} ${BZIP2} -d -q -s ${bzcopy} && { echo "PASS: ${bzfile} Redecompress (small)"; } \ + || { echo "FAIL: ${bzfile} Redecompress (small)"; badtests=("${badtests[@]}" $"${bzcopy} bad result") nogood=$[${nogood}+1]; continue; } if [[ ${IGNORE_MD5} -ne 1 ]]; then - md5sum --check --status ${md5file} < ${copy} \ - || { echo "!!! md5sum doesn't match (re)decompressed file"; + md5sum -c ${md5file} < ${copy} && { echo "PASS: ${bzfile} md5sum Matched"; } \ + || { echo "FAIL: ${bzfile} md5sum : Miss Matched"; badtests=("${badtests[@]}" $"${copy} md5sum doesn't match") nogood=$[${nogood}+1]; continue; } fi @@ -176,7 +176,7 @@ while IFS= read -r -d '' badfile; do ret=$? if [[ ${ret} -eq 0 ]]; then - echo "!!! badness not detected" + echo "FAIL: badness not detected" nobad=$[${nobad}+1] badtests=("${badtests[@]}" $"${badfile} badness not detected") continue @@ -185,10 +185,12 @@ while IFS= read -r -d '' badfile; do # Assumes "normal" badness is detected by exit code 1 or 2. # A crash or valgrind issue will be reported with something else. if [[ ${ret} != 1 ]] && [[ ${ret} != 2 ]]; then - echo "!!! baddness caused baddness in ${BZIP2}" + echo "FAIL: baddness caused baddness in ${BZIP2}" badbad=$[${badbad}+1] badtests=("${badtests[@]}" $"${badfile} badness caused baddness") continue + else + echo "PASS: Correctly found data integrity errors in ${badfile} during decompress." fi echo " Trying to decompress (small)..." @@ -196,7 +198,7 @@ while IFS= read -r -d '' badfile; do ret=$? if [[ ${ret} -eq 0 ]]; then - echo "!!! badness not detected" + echo "FAIL: badness not detected " nobad=$[${nobad}+1] badtests=("${badtests[@]}" $"${badfile} badness not detected") continue @@ -205,10 +207,12 @@ while IFS= read -r -d '' badfile; do # Assumes "normal" badness is detected by exit code 1 or 2. # A crash or valgrind issue will be reported with something else. if [[ ${ret} != 1 ]] && [[ ${ret} != 2 ]]; then - echo "!!! baddness caused baddness in ${BZIP2}" + echo "FAIL: baddness caused baddness in ${BZIP2}" badbad=$[${badbad}+1] badtests=("${badtests[@]}" $"${badfile} badness caused baddness") continue + else + echo "PASS: Correctly found data integrity errors in ${badfile} during decompress (small)" fi done < <(find ${TESTS_DIR} -type f -name \*\.bz2.bad -print0) -- 2.7.4