test: Load modules before testing for filesystems

The previous commit moved some filesystems to kernel modules.
modprobe them before checking if they are enabled.

Also update the YAML files for the tests.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-06-22 23:10:04 +01:00
parent 492b6c3fdb
commit 8d4dfb25e6
6 changed files with 14 additions and 8 deletions

View File

@@ -3,3 +3,4 @@ RUN apk update && apk upgrade && apk add --no-cache bash
ADD https://raw.githubusercontent.com/docker/docker/master/contrib/check-config.sh /check-config.sh
ADD . ./
ENTRYPOINT ["/bin/sh", "/check.sh"]
LABEL org.mobyproject.config='{"readonly": true, "binds": ["/lib/modules:/lib/modules", "/dev:/dev", "/sys:/sys"], "capabilities": ["all"]}'

View File

@@ -86,6 +86,15 @@ echo $UNZIPPED_CONFIG | grep -q 'CONFIG_LEGACY_PTYS is not set' || fail "CONFIG_
echo $UNZIPPED_CONFIG | grep -q 'CONFIG_X86_X32 is not set' || fail "CONFIG_X86_X32 is not set"
echo $UNZIPPED_CONFIG | grep -q 'CONFIG_MODIFY_LDT_SYSCALL is not set' || fail "CONFIG_MODIFY_LDT_SYSCALL is not set"
# modprobe
for mod in \
nfs \
nfsd \
ntfs
do
modprobe $mod
done
# check filesystems that are built in
for fs in \
sysfs \