Skip to content

Commit 76b6c7c

Browse files
committed
Add initial github tests
Add running and packaging tests. Fix problems found when adding tests Signed-off-by: Corentin Labbe <[email protected]>
1 parent 0eead3d commit 76b6c7c

File tree

4 files changed

+60
-2
lines changed

4 files changed

+60
-2
lines changed

.github/workflows/tests.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
# yamllint disable rule:line-length
3+
name: tests yasat
4+
5+
on: # yamllint disable-line rule:truthy
6+
push:
7+
pull_request:
8+
9+
jobs:
10+
test-ubuntu:
11+
runs-on: ubuntu-latest
12+
name: test on ubuntu
13+
steps:
14+
- uses: actions/checkout@v4
15+
- name: update pkglist
16+
run: sudo apt-get update
17+
- name: Run yasat
18+
run: |
19+
./yasat
20+
./yasat -a
21+
ubuntu-pkg:
22+
runs-on: ubuntu-latest
23+
name: build ubuntu package
24+
steps:
25+
- uses: actions/checkout@v4
26+
- name: update pkglist
27+
run: sudo apt-get update
28+
- name: Install packages
29+
run: sudo apt-get -y install devscripts gnupg debhelper-compat
30+
- name: create orig targz
31+
run: cd .. && tar czf yasqt_0-1.orig.tar.gz yasat
32+
- name: Run ls
33+
run: ls -l
34+
- name: Run debuild
35+
run: debuild -i -us -uc -b
36+

common

+14
Original file line numberDiff line numberDiff line change
@@ -2455,6 +2455,20 @@ Is_installed_via_package_manager()
24552455
return 0;
24562456
fi
24572457
if [ "$LIST_PKG" = "emerge" ] ;then
2458+
if [ -z "$CACHE_EMERGE_OK" ];then
2459+
# check if we have can use portage
2460+
emerge --info 2>/dev/null >/dev/null
2461+
if [ $? -ne 0 ];then
2462+
Display --indent 2 --text "Could not work with emerge (cached)" --result EPERM --color RED
2463+
CACHE_EMERGE_OK="ko"
2464+
return 0
2465+
fi
2466+
fi
2467+
if [ "$CACHE_EMERGE_OK" = 'ko' ];then
2468+
Display --indent 2 --text "Could not work with emerge (cached)" --result EPERM --color RED
2469+
return 0
2470+
fi
2471+
CACHE_EMERGE_OK="ok"
24582472
#TODO could be better
24592473
PKGLIST="`equery -C -q l $1`"
24602474
if [ -z "$PKGLIST" ] ;then

debian/compat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5
1+
7

plugins/apache_modules.test

+9-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,15 @@ fi
6565
check_file "$APACHE_BIN" 2 BINARY
6666

6767
if [ "$LINUX_VERSION" = "Gentoo" ] ;then
68-
. /etc/conf.d/apache2
68+
if [ ! -r /etc/conf.d/apache2 ];then
69+
TESTNAME='YASAT_TEST_APACHE_MODULES_READ_CONFD_APACHE Check if we can use /etc/conf.d/apache2'
70+
Display --indent 2 --text "Cannot read /etc/conf.d/apache2" --result ERROR --color RED
71+
else
72+
. /etc/conf.d/apache2
73+
if [ $? -ne 0 ];then
74+
echo "ERROR: could not read /etc/conf.d/apache2"
75+
fi
76+
fi
6977
APACHE_BIN="$APACHE_BIN $APACHE2_OPTS"
7078
fi
7179

0 commit comments

Comments
 (0)