Skip to content

Commit

Permalink
Merge pull request #947 from stilor/docker-testing
Browse files Browse the repository at this point in the history
Docker-based  testing for Linux distros
  • Loading branch information
stilor committed Apr 18, 2018
2 parents 5472517 + 345dc41 commit 90d1444
Show file tree
Hide file tree
Showing 7 changed files with 154 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -18,13 +18,19 @@ config/versions/
verbatim-data.mk
maintainer/package-versions

*.tar.xz
*.tar.bz2

# Temporaries
.*.swp
build.log
.config.old
temp.*
stamp-h1

# Testing
testing/docker/build-*

# This is the place where toolchains are built
.build/
# .. and log for 'build-all'
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -167,7 +167,7 @@ CTNG_PROG_VERSION_REQ_ANY([MAKE],
[make_3_81_or_newer])

# Check other companion tools that we may or may not build.
CTNG_PROG_VERSION([LIBTOOL],
CTNG_PROG_VERSION_REQ_STRICT([LIBTOOL],
[GNU libtool >= 2.4],
[libtool],
[glibtool libtool],
Expand Down
3 changes: 3 additions & 0 deletions testing/docker/archlinux/Dockerfile
@@ -0,0 +1,3 @@
FROM hoverbear/archlinux
RUN pacman -Syu --noconfirm
RUN pacman -S --noconfirm base-devel git help2man python
10 changes: 10 additions & 0 deletions testing/docker/common-scripts/ctng-install
@@ -0,0 +1,10 @@
#!/bin/bash

set -e
cd
rm -rf bld-ctng
mkdir bld-ctng
cd bld-ctng
/crosstool-ng/configure --prefix=$HOME/inst-ctng
make
make install
12 changes: 12 additions & 0 deletions testing/docker/common-scripts/ctng-test-all
@@ -0,0 +1,12 @@
#!/bin/bash

set -e
cd
rm -rf bld-samples
mkdir bld-samples
cd bld-samples
export PATH=$HOME/inst-ctng/bin:$PATH
ct-ng help
ct-ng list-samples
ct-ng list-steps
ct-ng build-all
16 changes: 16 additions & 0 deletions testing/docker/common-scripts/su-as-user
@@ -0,0 +1,16 @@
#!/bin/bash

usr=$1
uid=$2
grp=$3
gid=$4
shift 4

groupadd -g ${gid} ${grp}
useradd -d /home/${usr} -m -g ${gid} -u ${uid} ${usr}
ln -sf /src /home/${usr}/src
if [ -z "$*" ]; then
exec su -l ${usr}
else
exec su -l -c "/bin/bash -c '$*'" ${usr}
fi
106 changes: 106 additions & 0 deletions testing/docker/dmgr.sh
@@ -0,0 +1,106 @@
#!/bin/bash

# Run from the directory containing this script
cd `dirname $0`

msg()
{
echo "INFO :: $*" >&2
}

error()
{
echo "ERROR :: $*" >&2
exit 1
}

usage()
{
cat >&2 <<EOF
${1:+ERROR :: $1
}Usage: $0 [action] [containters]
Action is one of:
build Build or rebuild the specified containers.
If containers are not specified, the action is applied to all available containers.
EOF
exit 1
}

# Build a docker container, store its ID.
action_build()
{
local cntr=$1

msg "Building Docker container for ${cntr}"
docker build -t "ctng-${cntr}" "${cntr}"
}

# Common backend for enter/test
_dckr()
{
local topdir=`cd ../.. && pwd`
local cntr=$1
shift

mkdir -p build-${cntr}
docker run --rm -i -t \
-v `pwd`/common-scripts:/setup-scripts:ro \
-v ${topdir}:/crosstool-ng:ro \
-v `pwd`/build-${cntr}:/home \
-v $HOME/src:/src:ro \
ctng-${cntr} \
/setup-scripts/su-as-user `id -un` `id -u` `id -gn` `id -g` "$@"
}

# Run the test
action_test()
{
local cntr=$1

# The test assumes the top directory is bootstrapped, but clean.
msg "Setting up crosstool-NG in ${cntr}"
_dckr "${cntr}" /setup-scripts/ctng-install
msg "Running build-all in ${cntr}"
_dckr "${cntr}" /setup-scripts/ctng-test-all
}

# Enter the container using the same user account/environment as for testing.
action_enter()
{
local cntr=$1

msg "Entering ${cntr}"
_dckr "${cntr}"
}

# Clean up after test suite run
action_clean()
{
local cntr=$1

msg "Cleaning up after ${cntr}"
rm -rf build-${cntr}
}

action=$1
shift
all_containers=`ls */Dockerfile | sed 's,/Dockerfile,,'`
selected_containers="${*:-${all_containers}}"

case "${action}" in
build|test|enter|clean)
for c in ${selected_containers}; do
eval "action_${action} $c"
done
;;
"")
usage "No action specified."
;;
*)
usage "Unknown action ${action}."
;;
esac

0 comments on commit 90d1444

Please sign in to comment.