Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
652 commits
Select commit Hold shift + click to select a range
4528e62
Merge branch 'master' of https://github.com/hyades/gst-switch
hyades Sep 12, 2013
f5dca4f
Modified install.sh
hyades Sep 12, 2013
2d01386
Update README [skip-ci]
hyades Sep 13, 2013
09935b9
Update README.md [skip-ci]
hyades Sep 13, 2013
c2a857b
Update README.md [skip-ci]
hyades Sep 14, 2013
b1196ea
modified Makefile
hyades Sep 14, 2013
1fe902c
Merge branch 'master' of https://github.com/hyades/gst-switch
hyades Sep 14, 2013
546d7bd
.travis-setup.sh: trying out some extra modules
hyades Sep 15, 2013
3e7fcd0
.travis-setup.sh: trying out if ubuntu-desktop works
hyades Sep 15, 2013
c542dfa
.travis-setup.sh: corrected some changes
hyades Sep 15, 2013
8ce749a
.travis-setup.sh: remove all extra modules
hyades Sep 15, 2013
f62cb41
.travis.yml: modifying permissions
hyades Sep 15, 2013
ce5b7e3
trying put things
hyades Sep 15, 2013
c449734
Revert "trying put things"
hyades Sep 15, 2013
7775923
.travis-setup.sh: trying out changes
hyades Sep 16, 2013
c6e7517
.travis-setup.sh: trying out changes
hyades Sep 16, 2013
be80640
.travis-setup: removed copying typelibs
hyades Sep 16, 2013
b744d94
trying out prefix /usr
hyades Sep 16, 2013
5e1cf91
Trying out ubuntu-desktop
hyades Sep 16, 2013
3ce6b21
Editing
hyades Sep 16, 2013
10d7c6d
Added README.md and WRITING_TESTS.md
hyades Sep 17, 2013
d088313
Update python-api/README.md [skip-ci]
hyades Sep 17, 2013
5260281
Update WRITIN_TESTS.md [skip_ci]
hyades Sep 17, 2013
7322963
Update README.md [skip-ci]
hyades Sep 17, 2013
b02e48c
Added file changes to travis-setup.py
hyades Sep 17, 2013
1e203ce
Revert previous commit
hyades Sep 17, 2013
105f32d
fixed README.md
hyades Sep 17, 2013
a254e47
Added file FORKING.md
hyades Sep 18, 2013
8e090da
Update FORKING.md [skip-ci]
hyades Sep 18, 2013
b144dbc
Update README.md [skip-ci]
hyades Sep 18, 2013
10d3364
Update WRITING_TESTS.md [skip-ci]
hyades Sep 18, 2013
5c13659
Update .travis-setup.sh
hyades Sep 18, 2013
1584afb
Update install.sh
hyades Sep 18, 2013
f93f7a7
Update install.sh [ci skip]
hyades Sep 19, 2013
ebf5d22
Update .travis-setup.sh
hyades Sep 19, 2013
289db45
Added TEST-RESULTS.md, moved FORKING.md
hyades Sep 20, 2013
8748db4
Update TEST-RESULTS.md [ci skip]
hyades Sep 20, 2013
d8f684e
Update TEST-RESULTS.md
hyades Sep 21, 2013
fd2ce1b
Update TEST-RESULYTS.md [ci skip]
hyades Sep 21, 2013
3cf7875
Modified .travis-setup.sh
hyades Sep 22, 2013
ae2a9ba
Dependency gstreamer0.10
hyades Sep 22, 2013
3176ba0
Update .travis-update.sh
hyades Sep 22, 2013
b4847cc
Update .travis-update.sh
hyades Sep 22, 2013
d3dcc3b
Update README.md [ci skip]
hyades Sep 23, 2013
4cedb87
Update README.md
hyades Sep 23, 2013
434074f
Update Makefile.am
hyades Sep 23, 2013
8052881
Update .travis-setup.sh
hyades Sep 23, 2013
13e1c17
Update .travis-setup.sh
hyades Sep 23, 2013
95252b1
Update .travis-setup.sh
hyades Sep 23, 2013
7207bfd
Update Makefile.am
hyades Sep 23, 2013
17938e3
Update .travis-run.sh
hyades Sep 23, 2013
fa947b9
Update .travis-setup.sh [ci skip]
hyades Sep 23, 2013
c2bc373
Update .travis.yml
hyades Sep 23, 2013
1d816ca
Update README.md [ci skip]
hyades Sep 23, 2013
cfa7e8d
Added install2.sh
hyades Sep 23, 2013
20beb38
trying removing checkouts
hyades Sep 23, 2013
c1e0e10
Removed export display
hyades Sep 23, 2013
e1c7538
Update .travis-setup.sh
hyades Sep 24, 2013
8a73eee
Update .travis-setup.sh
hyades Sep 24, 2013
c2d0b36
Update .travis.yml
hyades Sep 24, 2013
5798497
Updated localhost
hyades Sep 24, 2013
41d247f
Merge branch 'master' of github.com:hyades/gst-switch
hyades Sep 24, 2013
b359d26
Updated localhost
hyades Sep 24, 2013
7163e1a
Updated .travis-setup.sh
hyades Sep 24, 2013
01d1691
Update Makefile
hyades Sep 24, 2013
eeaf8dc
Merge pull request #25 from hyades/master
hyades Sep 25, 2013
18caf85
Update .travis-setup.sh
hyades Sep 25, 2013
bdf23c6
Update README.md [ci skip]
hyades Sep 25, 2013
25d3ee0
Update README.md[ci skip]
hyades Sep 25, 2013
6c3a0cc
Update README.md [ci skip]
hyades Sep 25, 2013
3b6c9ba
Update README.md [ci skip]
hyades Sep 25, 2013
60ebcd6
Update README
hyades Sep 25, 2013
f1d4343
Update README.md
hyades Sep 25, 2013
a7a707d
Merge remote-tracking branch 'upstream/master'
hyades Sep 30, 2013
69f6bbf
Modified Coveralls Directory
hyades Sep 30, 2013
f8b0da2
Added script for infinite switching
hyades Oct 15, 2013
47ec618
Update gitignore
hyades Oct 15, 2013
7e7e751
Merge remote-tracking branch 'upstream/speaker-tracking'
hyades Oct 15, 2013
3dd480b
Remove upgrading
hyades Oct 15, 2013
7d7f76f
fix typos in readme
CarlFK Jan 8, 2014
c35e738
Merge remote-tracking branch 'upstream/master'
hyades Jan 11, 2014
d9be0a0
Disable lint check on number of public methods
hyades Jan 11, 2014
eba90e9
Checking out to previous commits for gst-plugins
hyades Jan 12, 2014
b95336f
Removing extra whitespace
hyades Jan 12, 2014
414fc98
Replaced hyades/gst-switch to timvideos/gst-switch
hyades Mar 29, 2014
a918da0
running hyades/ instead of timvideos/
Nov 2, 2014
87dd7f0
Build on Trusty without gst-switch-ptz.
CarlFK Nov 4, 2014
aa032c2
run-demo.sh runs the mixer, gui and 2 test streams.
CarlFK Nov 5, 2014
1ff2dd4
tweaks mithro asked for.
CarlFK Nov 5, 2014
9a135ae
Merge pull request #29 from CarlFK/master
mithro Nov 5, 2014
684d771
changing master to use timvideos/
Nov 5, 2014
d46eea9
adding upgrade to travis
Nov 5, 2014
d5b26fa
newline at python-api/scripts/switch_infinite_test.py
Nov 5, 2014
574955a
not using upgrade - might conflict with packages installed on travis VM
Nov 5, 2014
1fce46d
Merge pull request #26 from hyades/master
mithro Nov 5, 2014
9df7eb8
configure option to enable speakertrack/ptz
Nov 9, 2014
0d53bc4
doing lint changes
Nov 9, 2014
79b963f
fixing more lint errors
Nov 9, 2014
3ef5ccc
fixing lint errors
Nov 9, 2014
74df888
fixing lint errors
Nov 9, 2014
92e171d
Merge pull request #33 from hyades/master
mithro Nov 9, 2014
af57854
Upgrading packages if available
Nov 9, 2014
b675e35
Fix typo in #! line.
CarlFK Nov 9, 2014
abce192
Removing the non-useful README file.
mithro Nov 10, 2014
1711be4
Newer versions of ubuntu have avconv.
mithro Nov 5, 2014
3832e83
Merge pull request #35 from mithro/avconv
hyades Nov 13, 2014
a923f56
Massive update to the README.md file.
mithro Nov 10, 2014
6d811d1
Merge pull request #36 from mithro/readme-update
mithro Nov 14, 2014
9387328
Add test script that exposes lag between thumb and main screen.
CarlFK Nov 22, 2014
fda7e1a
test_ui_lag1: Add more sources, add source # to each.
CarlFK Nov 23, 2014
9789a90
Add test script that exposes lag between thumb and main screen.
CarlFK Nov 22, 2014
2488eb7
Merge branch 'master' of github.com:CarlFK/gst-switch
CarlFK Nov 23, 2014
d470e40
Merge pull request #38 from CarlFK/master
mithro Nov 24, 2014
cca3cdd
Disabling the pyliny precommit hook.
mithro Nov 24, 2014
e2d91fd
Use sync=false on imagesinks as feeds are live.
mithro Nov 24, 2014
026dca1
Disabling catching-non-exception (E0712).
mithro Nov 24, 2014
6c03cfc
Adding environment variables to make things cleaner.
mithro Nov 24, 2014
8374abc
Removing deprecated include-ids option.
mithro Nov 24, 2014
79f4e3f
Fixing lint errors.
mithro Nov 24, 2014
0787bc7
Disabling reports as they make seeing the issues to fix really hard.
mithro Nov 24, 2014
825b1cd
PEP8 fixes.
mithro Nov 24, 2014
53a4747
Replace faac component with voaacenc.
mithro Nov 24, 2014
02c1a54
Merge pull request #39 from mithro/disable-py-commit-hook
hyades Nov 26, 2014
9d5faf0
Echo PYTHONPATH and PYTHONWARNINGS as part of the lint output.
mithro Nov 27, 2014
21b1d45
Merge pull request #41 from mithro/pylint-fixes
hyades Nov 27, 2014
7c049da
Merge pull request #40 from mithro/sync-false
mithro Dec 1, 2014
6b77456
Merge pull request #42 from mithro/faac-replace
mithro Dec 3, 2014
fee82f4
Merge branch 'master' of https://github.com/timvideos/gst-switch
hyades Dec 5, 2014
1d7e9d6
Fixing paths to use local version of gst-switch instead of global
hyades Dec 6, 2014
e9456d5
Correcting method calls
hyades Dec 7, 2014
bd43693
Adding test-driver to gitignore
hyades Dec 7, 2014
d5a5898
Adding libvo-aacenc-dev to the setup
hyades Dec 7, 2014
fc0c3d3
GCOV_PREFIX not working. Applying coveralls to tools directory
hyades Dec 7, 2014
fb6bfa5
Preview helper uses sync=false
hyades Dec 7, 2014
ede2223
Merge pull request #60 from hyades/master
mithro Dec 7, 2014
c74f41e
Merge branch 'master' of https://github.com/timvideos/gst-switch
hyades Dec 15, 2014
9ad663c
Merge pull request #62 from hyades/preview_pipeline
mithro Dec 16, 2014
fa74128
Merge branch 'master' of https://github.com/timvideos/gst-switch
hyades Dec 16, 2014
ab70651
Detecting gst-switch-srv path using PATH variable
hyades Dec 15, 2014
aea7f1f
Unittests reflect path option
hyades Dec 16, 2014
3228ec8
Using os.path.join for generating Server path
hyades Dec 17, 2014
ff7910f
Merge pull request #67 from hyades/autopath
mithro Dec 25, 2014
c6abade
Trying out trusty build on travis.
mithro Dec 27, 2014
55620ba
Try not running via bash.
mithro Dec 27, 2014
e3eb64d
Small refactor of the .travis files.
mithro Dec 27, 2014
9bb456a
Fixing missing sudo.
mithro Dec 28, 2014
762cc45
Use the .py script.
mithro Dec 28, 2014
5d9212b
Merge pull request #85 from mithro/travis-fix
mithro Dec 29, 2014
541ffd7
Setting up glib unit testing support.
mithro Nov 28, 2014
288a5eb
Merge pull request #87 from deeprave/new-unit-testing
mithro Jan 5, 2015
240caff
Initial start of format parsing option (mithro)
mithro Nov 14, 2014
057f5e6
Add a unit test for video format option parsing.
Jan 5, 2015
81390fc
Fixing error handling inside gst_switch_controller_on_new_connection.
mithro Jan 6, 2015
346a73e
Moving the unref until after finished using.
mithro Jan 6, 2015
7009b13
Merge pull request #88 from deeprave/format-options
mithro Jan 7, 2015
4d73316
Merge pull request #89 from mithro/g_error_free
mithro Jan 7, 2015
55b0518
Enabling debug
hyades Jan 5, 2015
455a334
Improve debug output.
mithro Jan 5, 2015
5bb251d
Merge pull request #90 from mithro/enable-debug
hyades Jan 7, 2015
c61a582
Renaming the enum values to be clearer.
mithro Dec 24, 2014
b6e13b6
More renaming.
mithro Dec 24, 2014
4e04a8d
Renaming the composite modes.
mithro Dec 25, 2014
eef1c3b
Fixing header guards to be more standard.
mithro Dec 25, 2014
ce947ba
Spelling fixes.
mithro Dec 25, 2014
d02877b
Adding keyboard shortcuts for different composite modes.
mithro Dec 25, 2014
0e22712
Updating the README information with new shortcut table.
mithro Dec 25, 2014
9a262eb
Removing support for older gtk versions.
mithro Dec 25, 2014
a7c328d
Adding simple unittest for gstcomposite command.
mithro Jan 5, 2015
19c5a6a
Merge pull request #71 from mithro/master
hyades Jan 7, 2015
4b979df
Full patch with fixes for --record filename handling.
Jan 7, 2015
1a946bd
Indent fix.
Jan 7, 2015
38cc6be
Enable timestamp and hostname variables in --record filename
Jan 7, 2015
52f5d1a
Merge remote-tracking branch 'upstream/master' into pr/91
mithro Jan 7, 2015
a2f1edd
Indent fixes.
mithro Jan 7, 2015
2cce27e
Making sure build-essential is installed.
mithro Jan 7, 2015
6e7d900
Merge pull request #93 from mithro/add-build-essential
CarlFK Jan 7, 2015
5cdcd9f
Add missing CFLAGS/LDFLAGS for test_gstcomposite test
deeprave Jan 7, 2015
1fcac33
Detect additional command line options or files and consider this an …
Jan 8, 2015
c1087a3
fix: argc is a pointer to real argc, not argc itself
Jan 8, 2015
ebbf728
Merge pull request #94 from deeprave/master
mithro Jan 8, 2015
895b11f
Changing the default filename for recording.
mithro Jan 8, 2015
23a4fd9
Changing the recording file format.
mithro Jan 8, 2015
7bb0b4b
Adding more recording formats to ignore.
mithro Jan 8, 2015
ea35e54
Merge pull request #97 from mithro/output-format-fix
mithro Jan 8, 2015
c92433c
Adding queues needed for smooth recording.
mithro Jan 8, 2015
1af9184
Merge remote-tracking branch 'upstream/master' into output-format-fix
mithro Jan 8, 2015
dc718f5
Merge pull request #98 from mithro/output-format-fix
mithro Jan 8, 2015
3f7d6b3
correct dependency list
micolous Jan 9, 2015
8b37158
Make the log prefix be "command specific" rather then directory based.
mithro Jan 9, 2015
6513df4
Making run-demo very slightly nicer.
mithro Jan 9, 2015
1ee9a70
Fix the audio issue reported in #68.
mithro Jan 8, 2015
d07b60b
Refactor/simplify gstreamer pipeline string generation
Jan 9, 2015
440d763
Compatibility fixes discovered by output comparisons.
Jan 10, 2015
c96953e
Bump automake req to 1.11 and modify dist settings
thaytan Jan 9, 2015
cf9f8a2
Merge pull request #101 from deeprave/master
mithro Jan 10, 2015
4b53836
Add wildcard to cover numeric suffix on test data.
Jan 10, 2015
5cdcf42
Fix BRANCH_PREVIEW
Jan 10, 2015
f86cf49
Updating README.md with information.
mithro Jan 8, 2015
a5a059e
Changing the UI audio output.
mithro Jan 8, 2015
25c19ca
Fixing the audio output.
mithro Jan 9, 2015
e8f8c0b
Making the caps even tighter.
mithro Jan 10, 2015
ecb43a0
Merge pull request #99 from mithro/audio-fix
mithro Jan 10, 2015
901b3cb
Merge pull request #103 from thaytan/bump-automake
mithro Jan 10, 2015
65c1938
Include changes to branch/audio
Jan 10, 2015
8e46d5a
Merge remote-tracking branch 'upstream/master' into refactor-gst-pipe…
Jan 10, 2015
f753aea
Merge pull request #104 from deeprave/refactor-gst-pipeline-string-si…
mithro Jan 10, 2015
a95b2f6
recorder: Simplify pipeline string building. Adjust queues
thaytan Jan 8, 2015
c57a02f
recorder: Send and wait for EOS on stop
thaytan Jan 10, 2015
89e06ac
Merge pull request #102 from thaytan/issue-84
mithro Jan 10, 2015
953591a
Add command line switch for setting video format (part 1/2)
Jan 10, 2015
d9c5cf7
Fix controller for multiple connections
hyades Jan 8, 2015
27a2d40
Merge pull request #106 from hyades/crash_fix
mithro Jan 10, 2015
5cb1843
Add support for dynamic video format support (part 2/2)
Jan 11, 2015
1775caf
Fix run-demo for video resolutions.
Jan 11, 2015
0f54bcb
Merge pull request #106 from deeprave:set-video-format-support
mithro Jan 11, 2015
f7f5f95
Fix segfault when calling gst-switch-srv with non-option arguments
MaZderMind Jan 11, 2015
6dbe3af
Don't use deprecated gtk_scrolled_window_add_with_viewport
MaZderMind Jan 11, 2015
63e60fa
Use the provided macros to stuff the GPid-int into the lists data-poi…
MaZderMind Jan 11, 2015
1293c5f
Value-Arrays are deprecated, access list_rms as an normal GArray
MaZderMind Jan 11, 2015
f310e32
Merge pull request #113 from MaZderMind/error-free
mithro Jan 11, 2015
d571934
Enable -Werror.
mithro Jan 11, 2015
dd37ff6
Merge pull request #118 from mithro/werror
mithro Jan 11, 2015
68311de
avoid pulling multiple copies of imgurbash.sh
MaZderMind Jan 11, 2015
e9819b6
remove .000, .001, … test-files on make clean
MaZderMind Jan 11, 2015
e3006ad
Changing localhost to 0.0.0.0
hyades Jan 11, 2015
e2101ff
Merge pull request #119 from hyades/localhost_conversion
mithro Jan 11, 2015
aa5e3f5
Save and use the video caps string for gstreamer pipelines
Jan 12, 2015
8c2d191
Merge pull request #120 from deeprave/caps-string-fix
mithro Jan 12, 2015
34a2532
Merge pull request #116 from MaZderMind/python-test-cleanup
mithro Jan 12, 2015
9404cb1
Fix record file format for API
hyades Jan 7, 2015
f3698c5
Tests for optional file record format
hyades Jan 11, 2015
819e497
Replace autovideoconvert with videoconvert
thaytan Jan 12, 2015
4327418
Merge pull request #123 from mithro/s-autovideoconvert-videoconvert
mithro Jan 13, 2015
b83e7c8
Also kill the UI on exit.
mithro Jan 14, 2015
00190ec
Merge pull request #130 from mithro/kill-ui
mithro Jan 14, 2015
cde4f3e
Adding audio caps and making sure caps is part of input.
mithro Jan 13, 2015
8c33ce9
Passing VIDEO_CAPS into gst-switch.
mithro Jan 14, 2015
e7ea10f
Merge pull request #126 from mithro/caps-everywhere
deeprave Jan 14, 2015
e2e2491
Merge pull request #107 from hyades/api_record_file_format
mithro Jan 14, 2015
4c08801
s/queue2/queue
mithro Jan 14, 2015
db47727
Merge pull request #131 from mithro/kill-queue2
mithro Jan 14, 2015
c799c53
Output the debug message with the error.
mithro Jan 15, 2015
ad8e701
Add commandline switch to client and server to set dbus timeout
Jan 15, 2015
8b8f07a
Merge pull request #136 from mithro/debug-output
deeprave Jan 15, 2015
e64917d
Merge pull request #138 from deeprave/add-dbus-timeout-client-and-server
mithro Jan 15, 2015
ef81da5
Not doing make clean to allow data to be sent to coveralls
hyades Jan 16, 2015
67133aa
Merge pull request #144 from hyades/makefile-clean-fix
mithro Jan 16, 2015
948d4c9
Handling fast connection close
hyades Jan 16, 2015
07f0fc9
Merge pull request #146 from hyades/dbus-connection-issue
mithro Jan 16, 2015
50c55fa
Ensure input stream is closed on error - Fixes #95
Jan 13, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
*.o
*.lo
*.la
*.pyc
*.gcda
*.gcov
*.txt
imgurbash.sh.*
.coverage
.gdb_history
.idea
/INSTALL
/Makefile
/Makefile.in
Expand All @@ -17,7 +25,16 @@
/config.sub
/configure
/depcomp
/docs/_build
/gstreamer
/gst-plugins-base
/gst-plugins-good
/gst-plugins-bad
/gst-plugins-base
/gst-switch.sublime-*
/libvpx
/html
/htmlcov
/install-sh
/libtool
/ltmain.sh
Expand All @@ -27,6 +44,10 @@
/plugins/.libs/
/plugins/Makefile
/plugins/Makefile.in
/python-api/imgurbash.sh*
/python-api/.cache/
/python-api/reports/
/python-api/htmlcov/
/stamp-h1
/tools/.deps/
/tools/Makefile
Expand All @@ -45,7 +66,9 @@
/timestamped*
/frames
/transition-strips
/record*.dat
*.data
*.log
/tools/gst-switch-ptz
test-driver
*.dat*
*.avi
*.mkv
*.log
67 changes: 67 additions & 0 deletions .travis-run.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#! /bin/bash -ex

./autogen.sh --prefix=/usr || {
printf "Failed to do autogen!!!\n"
exit -1
}
make clean
make || {
printf "make of gst-switch failed!!!\n"
exit -1
}
sudo make install || {
printf "make install of gst-switch failed!!!\n"
exit -1
}

cd python-api

case $TEST in

python-api )
case $TYPE in
unittest )
make unittests || {
printf "Unittests failed!\n"
exit -1
}
coveralls || {
printf "Coveralls failed!\n"
exit -1
}
;;
integration )
make integration || {
printf "Integration tests failed!\n"
exit -1
}
coveralls || {
printf "Coveralls failed!\n"
exit -1
}
;;
esac
;;
module )
case $TYPE in
python )
make test || {
printf "Tests failed!\n"
exit -1
}
coveralls || {
printf "Coveralls failed!\n"
exit -1
}
;;
c )
make test || {
printf "Tests failed!\n"
exit -1
}
coveralls -n -r ../tools
esac
esac || {
printf "Failed!\n!\n"
exit -1
}
28 changes: 28 additions & 0 deletions .travis-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#! /bin/bash -ex

# Update / upgrade everything
sudo apt-get -y update && sudo apt-get -y upgrade

# gst-switch compile stuff
sudo apt-get -y install build-essential dh-autoreconf
sudo apt-get -y install libgtk-3-dev
sudo apt-get -y install gstreamer1.0.* libgstreamer.*1.0.*

# Python stuff for gst-switch API
sudo apt-get -y install python-software-properties python-pip
sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 python-gi
sudo apt-get -y install python-scipy
sudo pip install mock --upgrade
sudo pip install pytest-cov --upgrade
sudo pip install pytest-pep8 --upgrade
sudo pip install pylint --upgrade

# Needed for tests
sudo apt-get -y install wget libav-tools

# Needed to get coverage output
if [ $TYPE == 'c' ]; then
sudo pip install cpp-coveralls
else
sudo pip install python-coveralls
fi
23 changes: 16 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
language: c
language:
- c

compiler:
- clang
- gcc

before_install:
- echo 'yes' | sudo add-apt-repository ppa:gstreamer-developers/ppa
- sudo apt-get update
- sudo apt-get install .*gstreamer.*1\.0.* libgtk-3-dev
- ./autogen.sh
env:
matrix:
- TEST=python-api TYPE=unittest
- TEST=python-api TYPE=integration
- TEST=module TYPE=python
- TEST=module TYPE=c

install:
- wget -q -O- https://raw.githubusercontent.com/mithro/travis-trusty/master/setup.sh | bash
- chmod a+rx $PWD/.travis-*.sh
- /trusty/run.py $PWD/.travis-setup.sh

script:
- /trusty/run.py $PWD/.travis-run.sh

notifications:
email:
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SUBDIRS = plugins tools tests
SUBDIRS = plugins tools tests/unit tests

EXTRA_DIST = autogen.sh

ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I build

include tests/names.mk
test: update-test-suite clean-test-data $(TESTS)
Expand Down
6 changes: 0 additions & 6 deletions README

This file was deleted.

1 change: 1 addition & 0 deletions README
Loading