Skip to content

Commit 420313d

Browse files
Yongjie2017H. Peter Anvin (Intel)
authored andcommitted
add project test support to dav1d
1 parent be03f16 commit 420313d

File tree

4 files changed

+45
-7
lines changed

4 files changed

+45
-7
lines changed

test/Makefile.in

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TESTS = $(wildcard *.asm)
1919
RM_F = rm -f
2020
RM_RF = rm -rf
2121

22-
.PHONY: tools nasm ndisasm ffmpegtest x264test
22+
.PHONY: tools nasm ndisasm ffmpegtest x264test dav1dtest
2323
tools:
2424
$(MAKE) -C .. all
2525

@@ -35,6 +35,9 @@ ffmpegtest:
3535
x264test:
3636
bash projtest.sh '$(NASM)' $@
3737

38+
dav1dtest:
39+
bash projtest.sh '$(NASM)' $@
40+
3841
%.bin: %.asm $(NASM)
3942
$(NASM) $(NASMOPT) -f bin -o $@ -MD $@.dep -l $@.lst $<
4043

@@ -119,7 +122,7 @@ clean:
119122
$(RM_F) *.aoutb
120123
$(RM_RF) testresults
121124
$(RM_F) elftest elftest64
122-
$(RM_RF) ffmpegtest x264test
125+
$(RM_RF) ffmpegtest x264test dav1dtest
123126

124127
spotless: clean
125128
$(RM_RF) golden

test/get_build_dav1dtest.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
: >> "$filelist"
4+
5+
if [ -d dav1d/.git ]; then
6+
cd dav1d
7+
git reset --hard
8+
cd build
9+
xargs -r rm -f < "$filelist"
10+
ninja clean
11+
else
12+
git clone https://code.videolan.org/videolan/dav1d.git dav1d
13+
mkdir -p dav1d/build
14+
cd dav1d/build
15+
meson setup ..
16+
fi
17+
: > "$filelist"
18+
#ncpus=$(ls -1 /sys/bus/cpu/devices | wc -l)
19+
ninja -v

test/nasm

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
#!/bin/bash
22

3+
DASHO=0
4+
35
declare -a param1
46
declare -a param2
57
for p; do
68
case "$p" in
7-
*.o) ofile="$p"
8-
param1+=("$p.1" '-l' "$p.lst.1")
9-
param2+=("$p.2" '-l' "$p.lst.2")
10-
printf '%s\n%s.2\n%s.lst.2\n' "$ofile" "$ofile" "$ofile" \
9+
-o ) param1+=("$p")
10+
param2+=("$p")
11+
DASHO=1
12+
;;
13+
*.o | *.obj)
14+
if [ "${DASHO}" -eq "1" ]; then
15+
DASHO=0
16+
ofile="$p"
17+
param1+=("$p.1" '-l' "$p.lst.1")
18+
param2+=("$p.2" '-l' "$p.lst.2")
19+
printf '%s\n%s.2\n%s.lst.2\n' "$ofile" "$ofile" "$ofile" \
1120
>> "$projnasm_filelist"
21+
else
22+
param1+=("$p")
23+
param2+=("$p")
24+
fi
1225
;;
1326
*) param1+=("$p")
1427
param2+=("$p")

test/projtest.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ fi
5050
set +x
5151

5252
{
53-
for x in $(grep -o -P "\-o .*\.o" $logfile | sed -e 's/-o //')
53+
for y in "o" "obj"
54+
do
55+
for x in $(grep -o -P "\-o .*\.${y}" $logfile | sed -e 's/-o //')
5456
do
5557
if ! [ -f $x ]; then
5658
# probably it's a temporary assembly being tested
@@ -74,6 +76,7 @@ do
7476
fi
7577
rm -f /tmp/1.dump /tmp/2.dump
7678
done
79+
done
7780
} | tee "$here/results"
7881

7982
rev=$(! grep -e " does not exist" -e "\[differs\]" $here/results >/dev/null)

0 commit comments

Comments
 (0)