dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7664 from poettering/fix-integration-tests

Browse Source 
Fix integration tests
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-12-16 15:01:04 +01:00
committed by GitHub
parent 3f2d136505 c4b0c4599d
commit 876317aee6
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/TEST-01-BASIC/Makefile
View File

@@ -1,4 +1,4 @@
BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

2
test/TEST-13-NSPAWN-SMOKE/Makefile
View File

@@ -1,4 +1,4 @@
BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

2
test/TEST-13-NSPAWN-SMOKE/test.sh
View File

@@ -147,7 +147,7 @@ function run {
# test --network-namespace-path works with a network namespace created by "ip netns"
ip netns add nspawn_test
_netns_opt="--network-namespace-path=/run/netns/nspawn_test"
UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" ip a | grep -E '^1: lo.*DOWN'
UNIFIED_CGROUP_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
local r=$?
ip netns del nspawn_test

2
test/TEST-17-UDEV-WANTS/Makefile
View File

@@ -1,4 +1,4 @@
BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

2
test/TEST-18-FAILUREACTION/Makefile
View File

@@ -1,4 +1,4 @@
BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@

2
test/TEST-19-DELEGATE/Makefile
View File

@@ -1,4 +1,4 @@
BUILD_DIR=$(exec ../../tools/find-build-dir.sh)
BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
all setup clean run:
@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@