fate: more cases of avconv that should be conditional
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		
							parent
							
								
									6322bc0b90
								
							
						
					
					
						commit
						091a24b75f
					
				@ -77,7 +77,7 @@ pcm(){
 | 
				
			|||||||
regtest(){
 | 
					regtest(){
 | 
				
			||||||
    t="${test#$2-}"
 | 
					    t="${test#$2-}"
 | 
				
			||||||
    ref=${base}/ref/$2/$t
 | 
					    ref=${base}/ref/$2/$t
 | 
				
			||||||
    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type"
 | 
					    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
codectest(){
 | 
					codectest(){
 | 
				
			||||||
 | 
				
			|||||||
@ -10,6 +10,7 @@ raw_src_dir=$3
 | 
				
			|||||||
target_exec=$4
 | 
					target_exec=$4
 | 
				
			||||||
target_path=$5
 | 
					target_path=$5
 | 
				
			||||||
threads=${6:-1}
 | 
					threads=${6:-1}
 | 
				
			||||||
 | 
					tool=$8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
datadir="./tests/data"
 | 
					datadir="./tests/data"
 | 
				
			||||||
target_datadir="${target_path}/${datadir}"
 | 
					target_datadir="${target_path}/${datadir}"
 | 
				
			||||||
@ -18,7 +19,7 @@ this="$test.$test_ref"
 | 
				
			|||||||
outfile="$datadir/$test_ref/"
 | 
					outfile="$datadir/$test_ref/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# various files
 | 
					# various files
 | 
				
			||||||
avconv="$target_exec ${target_path}/avconv"
 | 
					avconv="$target_exec ${target_path}/${tool}"
 | 
				
			||||||
tiny_psnr="tests/tiny_psnr"
 | 
					tiny_psnr="tests/tiny_psnr"
 | 
				
			||||||
raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 | 
					raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 | 
				
			||||||
raw_dst="$datadir/$this.out.yuv"
 | 
					raw_dst="$datadir/$this.out.yuv"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user