Apply new output folder structure to tests

TRON-Bioinformatics · Jul 26, 2023 · 77fa33d · 77fa33d
1 parent ff93682
commit 77fa33d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/scripts/run_test_01.sh b/tests/scripts/run_test_01.sh
@@ -48,10 +48,10 @@ fi
 
 ## Run output checks
 
-test -s ${output}/${tool}/reference.cnn || { echo "Error: Missing output file 'reference.cnn' for ${test_id}!"; exit 1; }
-test -s ${output}/${tool}/${sample_id_tum}.tumor.call.cns || { echo "Error: Missing output file '${sample_id_tum}.tumor.call.cns' for ${test_id}!"; exit 1; }
-test -s ${output}/${tool}/multi_intervals.target.bed || { echo "Error: Missing output file 'multi_intervals.target.bed' for ${test_id}!"; exit 1; }
-test -s ${output}/${tool}/multi_intervals.antitarget.bed || { echo "Error: Missing output file 'multi_intervals.antitarget.bed' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/reference.cnn || { echo "Error: Missing output file 'reference.cnn' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/${sample_id_tum}.tumor.call.cns || { echo "Error: Missing output file '${sample_id_tum}.tumor.call.cns' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/multi_intervals.target.bed || { echo "Error: Missing output file 'multi_intervals.target.bed' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/multi_intervals.antitarget.bed || { echo "Error: Missing output file 'multi_intervals.antitarget.bed' for ${test_id}!"; exit 1; }
 
 echo "Success: Output files are existing and non-empty"
 

diff --git a/tests/scripts/run_test_02.sh b/tests/scripts/run_test_02.sh
@@ -48,8 +48,8 @@ fi
 
 ## Run output checks
 
-test -s ${output}/${tool}/${sample_id_tum}.gz || { echo "Error: Missing output file '${sample_id_tum}.gz' for ${test_id}!"; exit 1; }
-test -s ${output}/${tool}/${sample_id_tum}.binned.gz || { echo "Error: Missing output file '${sample_id_tum}.binned.gz' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/${sample_id_tum}.gz || { echo "Error: Missing output file '${sample_id_tum}.gz' for ${test_id}!"; exit 1; }
+test -s ${output}/${tool}/${sample_id_tum}/${sample_id_tum}.binned.gz || { echo "Error: Missing output file '${sample_id_tum}.binned.gz' for ${test_id}!"; exit 1; }
 
 echo "Success: Output files are existing and non-empty"