fixes for test 14, which is working now

mshakya · Jun 26, 2018 · 88e07d3 · 88e07d3
1 parent dfd07bc
commit 88e07d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/runNUCmer.pl b/src/runNUCmer.pl
@@ -321,7 +321,7 @@ sub run_ref_nucmer {
             = fileparse( $ref_genome, qr/\.[^.]*/ );
         $ref_name =~ s/\.fna//;
         $full_genome_name =~ s/\.fna//;
-        my $prefix1   = $ref_name . '__' . $full_genome_name;
+        my $prefix1   = $ref_name . '_' . $full_genome_name;
         my $ref_fasta = $outdir . '/' . $ref_name . '_norepeats.fna';
         my $full_genome_fasta
             = $outdir . '/' . $full_genome_name . '_norepeats.fna';

diff --git a/test/TestAll.sh b/test/TestAll.sh
@@ -220,11 +220,12 @@ if [[ $1 -eq 14 ]] || [[ -z $1 ]];
 then
 	################### #13 Test the second time option#########################
 	mkdir -p test/workdirs/t14_secondtime
-	cp -r test/workdirs/t5_ebola_complete_contigs/* test/workdirs/t14_secondtime/
+	cp -r test/workdirs/t4_ebola_complete/* test/workdirs/t14_secondtime/
+	# echo "ebola_contig" >> test/workdirs/t14_secondtime/working_list.txt
 	cp test/data/ebola_reads/*R[1-2].fastq test/workdirs/t14_secondtime/
 	perl src/runPhaME.pl test/ctl_files/t14_secondtime.ctl
 	a=$(grep -c ">" test/workdirs/t14_secondtime/results/t14_all_snp_alignment.fna)
-	b=12
+	b=11
 	if [ "$a" -eq "$b" ];then
 		echo "Test 14 finished without any errors";
 	else