let github CI run tests

netblue30 · Oct 24, 2020 · 300efec · 300efec
1 parent cd75258
commit 300efec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,16 +7,20 @@ on:
  branches: [ master ]
 
 jobs:
- build:
+ build_and_test:
  runs-on: ubuntu-20.04
  steps:
  - uses: actions/checkout@v2
  - name: install dependencies
- run: sudo apt-get install gcc-10 libapparmor-dev libselinux1-dev
+ run: sudo apt-get install gcc-10 libapparmor-dev libselinux1-dev expect xzdec
  - name: configure
- run: CC=gcc-10 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux
+ run: CC=gcc-10 ./configure --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux --prefix=/usr
  - name: make
  run: make
+ - name: make install
+ run: sudo make install
+ - name: run tests
+ run: SHELL=/bin/bash make test-github
  build-clang:
  runs-on: ubuntu-20.04
  steps:

diff --git a/Makefile.in b/Makefile.in
@@ -243,6 +243,9 @@ test-noprofiles: test-private-lib test-fcopy test-fnetfilter test-fs test-utils
 test-travis: test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-filters test-arguments
  echo "TEST COMPLETE"
 
+test-github: test-fcopy test-fnetfilter test-utils test-sysutils test-environment test-arguments
+ echo "TEST COMPLETE"
+
 ##########################################
 # Individual tests, some of them require root access
 # The tests are very intrusive, by the time you are done

diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
@@ -10,6 +10,7 @@ match_max 100000
 send -- "firejail less sysutils.sh\r"
 expect {
  timeout {puts "TESTING ERROR 1\n";exit}
+ "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit}
  "MALLOC_CHECK"
 }
 expect {

diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
@@ -3,7 +3,7 @@
 # Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 
-set timeout 10
+set timeout 15
 spawn $env(SHELL)
 match_max 100000
 

diff --git a/test/utils/man.exp b/test/utils/man.exp
@@ -10,6 +10,7 @@ match_max 100000
 send -- "man firejail\r"
 expect {
  timeout {puts "TESTING ERROR 0\n";exit}
+ "(press RETURN)" {puts "TESTING SKIP 1.1\n";exit}
  "Linux namespaces sandbox program"
 }
 after 100