diff options
| author |  netblue30 <netblue30@protonmail.com> | 2020-11-08 07:57:30 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-11-08 07:57:30 -0500 |
| commit | 521b1f442a1ad4a9f1a0904047968dbe608135f7 (patch) | |
| tree | 9c4f7eaea15bad06658183037ec38ef444541623 /Makefile.in | |
| parent | ci: enable test-fs tests on github-ci (diff) | |
| parent | Update linphone profile (#3734) (diff) | |
| download | firejail-521b1f442a1ad4a9f1a0904047968dbe608135f7.tar.gz firejail-521b1f442a1ad4a9f1a0904047968dbe608135f7.tar.zst firejail-521b1f442a1ad4a9f1a0904047968dbe608135f7.zip | |
Merge branch 'master' into tests
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 56e9bfc70..c070688e4 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -240,10 +240,8 @@ test: test-profiles test-private-lib test-fcopy test-fnetfilter test-fs test-uti | |||
| 240 | test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments | 240 | test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters test-arguments |
| 241 | echo "TEST COMPLETE" | 241 | echo "TEST COMPLETE" |
| 242 | 242 | ||
| 243 | test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-filters test-arguments | 243 | #test-github: test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments |
| 244 | echo "TEST COMPLETE" | 244 | test-github: test-fs |
| 245 | |||
| 246 | test-github: test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-arguments | ||
| 247 | echo "TEST COMPLETE" | 245 | echo "TEST COMPLETE" |
| 248 | 246 | ||
| 249 | ########################################## | 247 | ########################################## |