aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml10
-rw-r--r--Makefile.in3
-rwxr-xr-xtest/sysutils/less.exp1
-rwxr-xr-xtest/sysutils/xz.exp2
-rwxr-xr-xtest/utils/man.exp1
5 files changed, 13 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5ee3d733d..214f39923 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,16 +7,20 @@ on:
7 branches: [ master ] 7 branches: [ master ]
8 8
9jobs: 9jobs:
10 build: 10 build_and_test:
11 runs-on: ubuntu-20.04 11 runs-on: ubuntu-20.04
12 steps: 12 steps:
13 - uses: actions/checkout@v2 13 - uses: actions/checkout@v2
14 - name: install dependencies 14 - name: install dependencies
15 run: sudo apt-get install gcc-10 libapparmor-dev libselinux1-dev 15 run: sudo apt-get install gcc-10 libapparmor-dev libselinux1-dev expect xzdec
16 - name: configure 16 - name: configure
17 run: CC=gcc-10 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux 17 run: CC=gcc-10 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux --prefix=/usr
18 - name: make 18 - name: make
19 run: make 19 run: make
20 - name: make install
21 run: sudo make install
22 - name: run tests
23 run: SHELL=/bin/bash make test-github
20 build-clang: 24 build-clang:
21 runs-on: ubuntu-20.04 25 runs-on: ubuntu-20.04
22 steps: 26 steps:
diff --git a/Makefile.in b/Makefile.in
index bc0fa0096..e34a38ab6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,6 +243,9 @@ test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils
243test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-filters test-arguments 243test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-filters test-arguments
244 echo "TEST COMPLETE" 244 echo "TEST COMPLETE"
245 245
246test-github: test-fcopy test-fnetfilter test-utils test-sysutils test-environment test-arguments
247 echo "TEST COMPLETE"
248
246########################################## 249##########################################
247# Individual tests, some of them require root access 250# Individual tests, some of them require root access
248# The tests are very intrusive, by the time you are done 251# The tests are very intrusive, by the time you are done
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
index 2bfb60302..daa666c18 100755
--- a/test/sysutils/less.exp
+++ b/test/sysutils/less.exp
@@ -10,6 +10,7 @@ match_max 100000
10send -- "firejail less sysutils.sh\r" 10send -- "firejail less sysutils.sh\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 1\n";exit} 12 timeout {puts "TESTING ERROR 1\n";exit}
13 "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit}
13 "MALLOC_CHECK" 14 "MALLOC_CHECK"
14} 15}
15expect { 16expect {
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
index 63b1ad3c7..a0ab917c7 100755
--- a/test/sysutils/xz.exp
+++ b/test/sysutils/xz.exp
@@ -3,7 +3,7 @@
3# Copyright (C) 2014-2020 Firejail Authors 3# Copyright (C) 2014-2020 Firejail Authors
4# License GPL v2 4# License GPL v2
5 5
6set timeout 10 6set timeout 15
7spawn $env(SHELL) 7spawn $env(SHELL)
8match_max 100000 8match_max 100000
9 9
diff --git a/test/utils/man.exp b/test/utils/man.exp
index 3cde9f2c8..102701a6a 100755
--- a/test/utils/man.exp
+++ b/test/utils/man.exp
@@ -10,6 +10,7 @@ match_max 100000
10send -- "man firejail\r" 10send -- "man firejail\r"
11expect { 11expect {
12 timeout {puts "TESTING ERROR 0\n";exit} 12 timeout {puts "TESTING ERROR 0\n";exit}
13 "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit}
13 "Linux namespaces sandbox program" 14 "Linux namespaces sandbox program"
14} 15}
15after 100 16after 100