reconstruct ffmpegtest to be generic to support more different projects

Author: Yongjie2017

.gitignore

@@ -95,6 +95,7 @@ TAGS
 /test/perf/*.asm
 /test/testresults
 /test/ffmpegtest
+/test/x264test
 /version.h
 /version.mac
 /version.mak

test/Makefile.in

@@ -18,7 +18,7 @@ TESTS	= $(wildcard *.asm)
 RM_F	= rm -f
 RM_RF	= rm -rf
 
-.PHONY: tools nasm ndisasm ffmpegtest
+.PHONY: tools nasm ndisasm ffmpegtest x264test
 tools:
 	$(MAKE) -C .. all
 
@@ -29,7 +29,10 @@ $(NASM) $(NDISASM):
 	$(MAKE) -C .. $(@F)
 
 ffmpegtest:
-	bash ffmpegtest.sh '$(NASM)'
+	bash projtest.sh '$(NASM)' $@
+
+x264test:
+	bash projtest.sh '$(NASM)' $@
 
 %.bin: %.asm $(NASM)
 	$(NASM) $(NASMOPT) -f bin -o $@ -MD $@.dep -l $@.lst $<
@@ -108,7 +111,7 @@ clean:
 	$(RM_F) *.aoutb
 	$(RM_RF) testresults
 	$(RM_F) elftest elftest64
-	$(RM_RF) ffmpegtest
+	$(RM_RF) ffmpegtest x264test
 
 spotless: clean
 	$(RM_RF) golden

test/get_build_ffmpegtest.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+: >> "$filelist"
+
+if [ -d ffmpeg/.git ]; then
+    cd ffmpeg
+    git reset --hard
+    xargs -r rm -f < "$filelist"
+else
+    git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+    cd ffmpeg
+fi
+: > "$filelist"
+./configure --disable-stripping
+ncpus=$(ls -1 /sys/bus/cpu/devices | wc -l)
+make -j${ncpus}

test/get_build_x264test.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+: >> "$filelist"
+
+if [ -d x264/.git ]; then
+    cd x264
+    git reset --hard
+    xargs -r rm -f < "$filelist"
+    make clean
+else
+    git clone https://code.videolan.org/videolan/x264.git x264
+    cd x264
+fi
+: > "$filelist"
+./configure
+ncpus=$(ls -1 /sys/bus/cpu/devices | wc -l)
+make -j${ncpus}

test/ffmpegnasm.sh renamed to test/nasm

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 declare -a param1
 declare -a param2
 for p; do
@@ -7,17 +8,17 @@ for p; do
 	     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" \
-		    >> "$ffmpegnasm_filelist"
+		    >> "$projnasm_filelist"
 	     ;;
 	*)   param1+=("$p")
 	     param2+=("$p")
 	     ;;
     esac
 done
 
-printf '%s\n' "$*" >> "$ffmpegnasm_logfile"
+printf '%s\n' "$*" >> "$projnasm_logfile"
 
 rm -f "$ofile"
-"$ffmpegnasm_nasm1" "${param1[@]}" || exit $?
-"$ffmpegnasm_nasm2" "${param2[@]}" || exit $?
+"$projnasm_nasm1" "${param1[@]}" || exit $?
+"$projnasm_nasm2" "${param2[@]}" || exit $?
 cp -f "$ofile.1" "$ofile"

test/ffmpegtest.sh renamed to test/projtest.sh

@@ -8,56 +8,54 @@ if [ -z "$NASM1" ]; then
 	echo 'Please install a reference nasm ...' 1>&2
 	exit 1
 fi
+
 NASM2="$1"
 [ -z "$NASM2" ] && NASM2=../nasm
 NASM2=$(which "$NASM2" 2>/dev/null)
-
 if [ -z "$NASM2" ]; then
     echo 'Test nasm not found' 1>&2
     exit 1
 fi
 
+PROJ="$2"
+PROJ_GET_BUILD="get_build_${PROJ}.sh"
+if ! [ -f ${PROJ_GET_BUILD} ]; then
+	echo 'No knowledge in building the project' 1>&2
+	exit 1
+fi
+
+export PATH=${PWD}:$PATH
+
 set -x
 
-mkdir -p "${there}/ffmpegtest"
-cd "${there}/ffmpegtest"
+mkdir -p "${there}/${PROJ}"
+cd "${there}/${PROJ}"
 here="$(pwd)"
 
 logfile="$here/test.log"
 filelist="$here/file.list"
 rm -f "$logfile"
-export ffmpegnasm_logfile="$logfile"
-export ffmpegnasm_filelist="$filelist"
-export ffmpegnasm_nasm1="$NASM1"
-export ffmpegnasm_nasm2="$NASM2"
-
-ffmpegnasm="$(realpath "$there/ffmpegnasm.sh")"
-
-: >> "$filelist"
+export projnasm_logfile="$logfile"
+export projnasm_filelist="$filelist"
+export projnasm_nasm1="$NASM1"
+export projnasm_nasm2="$NASM2"
 
-if [ -d ffmpeg/.git ]; then
-    cd ffmpeg
-    git reset --hard
-    xargs -r rm -f < "$filelist"
-else
-    git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
-    cd ffmpeg
-fi
-: > "$filelist"
-./configure --disable-stripping --x86asmexe="$ffmpegnasm"
-ncpus=$(ls -1 /sys/bus/cpu/devices | wc -l)
-make -j${ncpus}
+source ../${PROJ_GET_BUILD}
 rev=$?
-if [ "$?" -ne "0" ]; then
-	echo ffmpeg compiling failed ...
+if [ "$rev" -ne "0" ]; then
+	echo ${PROJ} compiling failed ...
 	exit $rev
 fi
 
 set +x
 
 {
-for x in $(grep -o -P "\-o .*\.o" $logfile | sed -e 's/-o //' | grep -v "/ffconf")
+for x in $(grep -o -P "\-o .*\.o" $logfile | sed -e 's/-o //')
 do
+	if ! [ -f $x ]; then
+		# probably it's a temporary assembly being tested
+		continue
+	fi
 	if ! [ -f ${x}.1 ]; then
 		echo file ${x}.1 does not exist
 	fi
@@ -78,6 +76,6 @@ do
 done
 } | tee "$here/results"
 
-rev=$(grep -e " does not exist" -e "\[differs\]" $here/results >/dev/null)
+rev=$(! grep -e " does not exist" -e "\[differs\]" $here/results >/dev/null)
 
 exit $rev