Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
1e7f9b0e
Commit
1e7f9b0e
authored
Nov 28, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tests: Fix running ffserver under qemu
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
c3f781c5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
Makefile
tests/Makefile
+1
-1
ffserver-regression.sh
tests/ffserver-regression.sh
+5
-1
No files found.
tests/Makefile
View file @
1e7f9b0e
...
...
@@ -17,7 +17,7 @@ ffservertest: ffserver$(PROGSSUF)$(EXESUF) ffmpeg$(PROGSSUF)$(EXESUF) tests/vsyn
@
echo
"Unfortunately ffserver is broken and therefore its regression"
@
echo
"test fails randomly. Treat the results accordingly."
@
echo
$(SRC_PATH)
/tests/ffserver-regression.sh
$(FFSERVER_REFFILE)
$(SRC_PATH)
/tests/ffserver.conf
$(SRC_PATH)
/tests/ffserver-regression.sh
$(FFSERVER_REFFILE)
$(SRC_PATH)
/tests/ffserver.conf
"
$(TARGET_SAMPLES)
"
"
$(TARGET_EXEC)
"
"
$(TARGET_PATH)
"
APITESTSDIR
:=
tests/api
OBJDIRS
+=
tests/data tests/vsynth1 tests/data/filtergraphs
$(APITESTSDIR)
/
...
...
tests/ffserver-regression.sh
View file @
1e7f9b0e
#!/bin/sh
target_samples
=
$3
target_exec
=
$4
target_path
=
$5
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
...
...
@@ -8,7 +12,7 @@
FILES
=
$(
sed
-n
's/^[^#]*<Stream \(.*\)>.*/\1/p'
$2
|
grep
-v
html
)
rm
-f
tests/feed1.ffm
.
/ffserver
${
PROGSUF
}
-d
-f
"
$2
"
2> /dev/null &
$target_exec
${
target_path
}
/ffserver
${
PROGSUF
}
-d
-f
"
$2
"
2> /dev/null &
FFSERVER_PID
=
$!
echo
"Waiting for feeds to startup..."
sleep
2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment