diff --git a/non-regression-tests/check_T4_class.py b/non-regression-tests/check_T4_class.py index 26c734c0e12037103b82e194290b8f817370bf6c..aee06503c73299ffa38e80273e666e45cf0b22ad 100644 --- a/non-regression-tests/check_T4_class.py +++ b/non-regression-tests/check_T4_class.py @@ -1,4 +1,4 @@ from common import check_class -ret=check_class("nrt.txt","UNKNOWN") -exit(ret) \ No newline at end of file +ret=check_class("nrt.txt","-") +exit(ret) diff --git a/non-regression-tests/run_HK97_long_multiproc.sh b/non-regression-tests/run_HK97_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..8a59e5d2671a8adbf831a549b317d7932756677e --- /dev/null +++ b/non-regression-tests/run_HK97_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on HK97 genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/HK97_assembly.fasta --nrt +python check_HK97_class.py diff --git a/non-regression-tests/run_Lamda_long_multiproc.sh b/non-regression-tests/run_Lamda_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..ea685076f0c5e27d6f68dfe03d82e023686edad4 --- /dev/null +++ b/non-regression-tests/run_Lamda_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on Lamda genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/Lambda_assembly.fasta --nrt +python check_Lamda_class.py diff --git a/non-regression-tests/run_P1_long_multiproc.sh b/non-regression-tests/run_P1_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..f86e6877861d295b2e4b75fb4ca25209b70c85b7 --- /dev/null +++ b/non-regression-tests/run_P1_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on P1 genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/P1_assembly.fasta --nrt +python check_P1_class.py diff --git a/non-regression-tests/run_StaphN1_long_multiproc.sh b/non-regression-tests/run_StaphN1_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..0a78f8e773a911ffbb6f5f74341216aa28a768ee --- /dev/null +++ b/non-regression-tests/run_StaphN1_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on Staph1N genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 --nrt -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/Staph1N_assembly.fasta +python check_Staph1N_class.py diff --git a/non-regression-tests/run_T4_long_multiproc.sh b/non-regression-tests/run_T4_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..2b304c61d8fc987294e494976e49a58c410b2fdb --- /dev/null +++ b/non-regression-tests/run_T4_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on T4 genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/T4_assembly.fasta --nrt +python check_T4_class.py diff --git a/non-regression-tests/run_T7_long_multiproc.sh b/non-regression-tests/run_T7_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..b3a8e14f89ff3f93eb8e707a454ef13f7a18f542 --- /dev/null +++ b/non-regression-tests/run_T7_long_multiproc.sh @@ -0,0 +1,6 @@ +#/bin/bash +DATA_PATH=./data + +echo "running PhageTerm on T7 genome and a dataset with a minimum 50x coverage" +python ../PhageTerm.py -c 4 -f "$DATA_PATH/R1_1M_READS_EACH_PHAGE(1).fastq.4" -p "$DATA_PATH/R2_1M_READS_EACH_PHAGE(1).fastq.4" -r $DATA_PATH/T7_assembly.fasta --nrt +python check_T7_class.py diff --git a/non-regression-tests/run_nrt_long.sh b/non-regression-tests/run_nrt_long.sh index 4f04b518bd3d7c472406b8713a43338424347907..3df7ebac78d26deabf42aac5ffb842f25e78cede 100755 --- a/non-regression-tests/run_nrt_long.sh +++ b/non-regression-tests/run_nrt_long.sh @@ -2,8 +2,8 @@ ## VL: decided to write the checking of results in python scripts rather than shel script for portability. echo "running non regression tests (short version)" ./run_HK97_long.sh || exit 1 -./run_lamda_long.sh || exit 1 -./run_N1_long.sh || exit 1 +./run_Lamda_long.sh || exit 1 +./run_StaphN1_long.sh || exit 1 ./run_P1_long.sh || exit 1 ./run_T4_long.sh || exit 1 ./run_T7_long.sh || exit 1 diff --git a/non-regression-tests/run_nrt_long_multiproc.sh b/non-regression-tests/run_nrt_long_multiproc.sh new file mode 100644 index 0000000000000000000000000000000000000000..b1138a27e91b49754f1624fa2e2531c0c886203f --- /dev/null +++ b/non-regression-tests/run_nrt_long_multiproc.sh @@ -0,0 +1,9 @@ +#/bin/bash +## VL: decided to write the checking of results in python scripts rather than shel script for portability. +echo "running non regression tests (short version)" +./run_HK97_long_multiproc.sh || exit 1 +./run_Lamda_long_multiproc.sh || exit 1 +./run_StaphN1_long_multiproc.sh || exit 1 +./run_P1_long_multiproc.sh || exit 1 +./run_T4_long_multiproc.sh || exit 1 +./run_T7_long_multiproc.sh || exit 1