Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 42 additions & 0 deletions .github/workflows/distcheck.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright 2024 Julio Merino.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Google Inc. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

set -eux

main() {
autoreconf -is
./configure
local result=0
make distcheck || result=$?
if [ "${result}" -ne 0 ]; then
find . -name test-suite.log | xargs cat
exit "${result}"
fi
}

main "${@}"
50 changes: 50 additions & 0 deletions .github/workflows/install-shtk.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Copyright 2024 Julio Merino.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Google Inc. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

set -eux

readonly VERSION=1.7

main() {
local prefix="${1}"; shift

local tmpdir
tmpdir="$(mktemp -d)"
trap "rm -rf '${tmpdir}'" EXIT HUP INT QUIT TERM

cd "${tmpdir}"

curl -LO "https://github.com/jmmv/shtk/releases/download/shtk-${VERSION}/shtk-${VERSION}.tar.gz"
tar xzvf "shtk-${VERSION}.tar.gz"
cd "shtk-${VERSION}"
./configure --prefix="${prefix}"
make
sudo make install
}

main "${@}"
44 changes: 44 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 2024 Julio Merino.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# * Neither the name of Google Inc. nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

name: Test

on: [push, pull_request]

jobs:
distcheck-linux:
runs-on: ubuntu-latest
env:
ACLOCAL_PATH: /usr/local/share/aclocal
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
steps:
- uses: actions/checkout@v4
- run: sudo apt update
- run: sudo apt install cvs
- run: ./.github/workflows/install-shtk.sh /usr/local
- run: ./.github/workflows/distcheck.sh
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
*~
*_test
*.log
*.trs
Makefile
Makefile.in
aclocal.m4
admin/install-sh
admin/missing
admin/test-driver
autom4te.cache
config.log
config.status
Expand Down
33 changes: 8 additions & 25 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -80,45 +80,28 @@ endif

dist_pkgtests_DATA = Kyuafile

pkgtests_SCRIPTS = sysbuild_test
TESTS = sysbuild_test
check_SCRIPTS = sysbuild_test
CLEANFILES += sysbuild_test
EXTRA_DIST += sysbuild_test.sh
sysbuild_test: $(srcdir)/sysbuild_test.sh
$(AM_V_GEN)source=sysbuild_test.sh target=sysbuild_test; \
$(BUILD_TEST)

pkgtests_SCRIPTS += sysbuild4cron_test
TESTS += sysbuild4cron_test
check_SCRIPTS += sysbuild4cron_test
CLEANFILES += sysbuild4cron_test
EXTRA_DIST += sysbuild4cron_test.sh
sysbuild4cron_test: $(srcdir)/sysbuild4cron_test.sh
$(AM_V_GEN)source=sysbuild4cron_test.sh target=sysbuild4cron_test; \
$(BUILD_TEST)

if HAVE_KYUA
CHECK_ENVIRONMENT = PATH=$(abs_top_builddir):$${PATH}
CHECK_ENVIRONMENT += SYSBUILD_SHAREDIR="$(abs_top_srcdir)"
TESTS_ENVIRONMENT = PATH=$(abs_top_builddir):$${PATH}
TESTS_ENVIRONMENT += SYSBUILD_SHAREDIR="$(abs_top_srcdir)"
INSTALLCHECK_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH}

check-local: check-kyua
PHONY_TARGETS += check-kyua
check-kyua:
$(CHECK_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
$(KYUA) --config=none test \
--kyuafile='$(top_srcdir)/Kyuafile' --build-root='$(top_builddir)'

installcheck-local: installcheck-kyua
PHONY_TARGETS += installcheck-kyua
installcheck-kyua:
cd $(pkgtestsdir) && $(INSTALLCHECK_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
$(KYUA) --config=none test
else # HAVE_KYUA
PHONY_TARGETS += missing-kyua
missing-kyua:
@echo "WARNING: kyua not found; no tests run"

check-local: missing-kyua
installcheck-local: missing-kyua
endif # HAVE_KYUA
installcheck-local:
$(MAKE) $(AM_MAKEFLAGS) check-TESTS TESTS_ENVIRONMENT="$(INSTALLCHECK_ENVIRONMENT)"

PHONY_TARGETS += clean-all
clean-all:
Expand Down
4 changes: 0 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ m4_ifndef([SHTK_CHECK],
SHTK_CHECK([>= 1.7])


AC_PATH_PROG([KYUA], [kyua])
AM_CONDITIONAL([HAVE_KYUA], [test -n "${KYUA}"])


AM_CONDITIONAL([HOST_IS_NETBSD], [test "$(uname -s)" = NetBSD])


Expand Down
Loading