add project test support to dav1d

test/Makefile.in

@@ -19,7 +19,7 @@ TESTS	= $(wildcard *.asm)
 RM_F	= rm -f
 RM_RF	= rm -rf
 
-.PHONY: tools nasm ndisasm ffmpegtest x264test
+.PHONY: tools nasm ndisasm ffmpegtest x264test dav1dtest
 tools:
 	$(MAKE) -C .. all
 
@@ -35,6 +35,9 @@ ffmpegtest:
 x264test:
 	bash projtest.sh '$(NASM)' $@
 
+dav1dtest:
+	bash projtest.sh '$(NASM)' $@
+
 %.bin: %.asm $(NASM)
 	$(NASM) $(NASMOPT) -f bin -o $@ -MD [email protected] -l [email protected] $<
 
@@ -119,7 +122,7 @@ clean:
 	$(RM_F) *.aoutb
 	$(RM_RF) testresults
 	$(RM_F) elftest elftest64
-	$(RM_RF) ffmpegtest x264test
+	$(RM_RF) ffmpegtest x264test dav1dtest
 
 spotless: clean
 	$(RM_RF) golden

test/get_build_dav1dtest.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+: >> "$filelist"
+
+if [ -d dav1d/.git ]; then
+    cd dav1d
+    git reset --hard
+    cd build
+    xargs -r rm -f < "$filelist"
+    ninja clean
+else
+    git clone https://code.videolan.org/videolan/dav1d.git dav1d
+    mkdir -p dav1d/build
+    cd dav1d/build
+    meson setup ..
+fi
+: > "$filelist"
+#ncpus=$(ls -1 /sys/bus/cpu/devices | wc -l)
+ninja -v

test/nasm

@@ -1,14 +1,27 @@
 #!/bin/bash
 
+DASHO=0
+
 declare -a param1
 declare -a param2
 for p; do
     case "$p" in
-	*.o) ofile="$p"
-	     param1+=("$p.1" '-l' "$p.lst.1")
-	     param2+=("$p.2" '-l' "$p.lst.2")
-	     printf '%s\n%s.2\n%s.lst.2\n' "$ofile" "$ofile" "$ofile" \
+        -o ) param1+=("$p")
+	     param2+=("$p")
+             DASHO=1
+             ;;
+	*.o | *.obj)
+             if [ "${DASHO}" -eq "1" ]; then
+                 DASHO=0
+                 ofile="$p"
+                 param1+=("$p.1" '-l' "$p.lst.1")
+	         param2+=("$p.2" '-l' "$p.lst.2")
+                 printf '%s\n%s.2\n%s.lst.2\n' "$ofile" "$ofile" "$ofile" \
 		    >> "$projnasm_filelist"
+             else
+                 param1+=("$p")
+                 param2+=("$p")
+             fi
 	     ;;
 	*)   param1+=("$p")
 	     param2+=("$p")
@@ -21,4 +34,6 @@ printf '%s\n' "$*" >> "$projnasm_logfile"
 rm -f "$ofile"
 "$projnasm_nasm1" "${param1[@]}" || exit $?
 "$projnasm_nasm2" "${param2[@]}" || exit $?
-cp -f "$ofile.1" "$ofile"
+if [ -f $ofile.1 ]; then
+	cp -f "$ofile.1" "$ofile"
+fi

test/projtest.sh

@@ -50,7 +50,9 @@ fi
 set +x
 
 {
-for x in $(grep -o -P "\-o .*\.o" $logfile | sed -e 's/-o //')
+for y in "o" "obj"
+do
+for x in $(grep -o -P "\-o .*\.${y}" $logfile | sed -e 's/-o //')
 do
 	if ! [ -f $x ]; then
 		# probably it's a temporary assembly being tested
@@ -74,6 +76,7 @@ do
 	fi
 	rm -f /tmp/1.dump /tmp/2.dump
 done
+done
 } | tee "$here/results"
 
 rev=$(! grep -e " does not exist" -e "\[differs\]" $here/results >/dev/null)