diff --git a/test/cases.expected b/test/cases.expected index 764c84b..ac93a73 100644 --- a/test/cases.expected +++ b/test/cases.expected @@ -4,5 +4,5 @@ PD-4797_multirow stx1 PARTIAL 100.00 1625 2852 - AAA98347.1 stxA1a 100.00 100.00 PD-4897_multirow_contig_end stx2 PARTIAL_CONTIG_END 11 274 + AAA16361.1 stxB2b 100.00 100.00 PD-4898_A2a_B2l stx2a COMPLETE 100.00 718 1958 + QZL10984.1 stxA2a 100.00 100.00 QZL10985.1 stxB2 100.00 100.00 PD-5064_ambiguous_bases stx2 AMBIGUOUS 99.27 333 1573 - AAA19623.1 stxA2 99.38 100.00 AAM90978.1 stxB2a 98.89 100.00 -multiple_calls_overlapping_PD-5181 stx2 PARTIAL 100.00 336 1474 + AAS07596.1 stxA2 100.00 100.00 AAA16363.1 stxB2c 100.00 62.22 +multiple_calls_overlapping_PD-5181 stx2 PARTIAL 100.00 336 1474 + AAS07596.1 stxA2 100.00 100.00 EED0303793.1 stxB2j 100.00 63.64 stx2d_better_stxB2k stx2d COMPLETE 100.00 3 1243 + AAM22256.1 stxA2 100.00 100.00 MCW3229578.1 stxB2d 100.00 100.00 diff --git a/test_stxtyper.sh b/test_stxtyper.sh index 7612c60..9961978 100755 --- a/test_stxtyper.sh +++ b/test_stxtyper.sh @@ -62,7 +62,7 @@ function test_input_file { then echo "${red}not ok: $STXTYPER returned a non-zero exit value indicating a failure of the software${reset}" echo "# $STXTYPER $options -n test/$test_base.fa > test/$test_base.got" - TEST_TEXT="$TEST_TEXT"$'\n'"Failed $test_base" + TEST_TEXT="$TEST_TEXT"$'\n'"${red}Failed $test_base${reset}" return 1 else if ! diff -q "test/$test_base.expected" "test/$test_base.got" @@ -73,7 +73,7 @@ function test_input_file { diff "test/$test_base.expected" "test/$test_base.got" echo "# To approve run:" echo "# mv test/$test_base.got test/$test_base.expected " - TEST_TEXT="$TEST_TEXT"$'\n'"Failed $test_base" + TEST_TEXT="$TEST_TEXT"$'\n'"${red}Failed $test_base${reset}" return 1 else echo "${green}ok:${reset} test/$test_base.fa" @@ -95,7 +95,7 @@ then diff "test/basic.nuc_out.expected" "test/basic.nuc_out.got" echo "# To approve run:" echo "# mv test/basic.nuc_out.got test/basic.nuc_out.expected " - TEST_TEXT="$TEST_TEXT"$'\n'"Failed basic --nucleotide_output test" + TEST_TEXT="$TEST_TEXT"$'\n'"${red}Failed basic --nucleotide_output test${reset}" FAILURES=$(( $FAILURES + 1 )) else echo "${green}ok:${reset} --nucleotide_output test/basic.nuc_out.got options worked"