mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-22 17:02:00 +01:00
Code Issues

make the runtime-tools directory one level deeper.

Browse Source
This commit is contained in:
utam0k 2022-01-08 22:55:46 +09:00
parent 636ecff8d4
commit e5263e3203
No known key found for this signature in database
GPG Key ID: 14ACDDE088DF059E
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,5 +1,5 @@
[submodule "integration_test/src/github.com/opencontainers/runtime-tools"]
path = integration_test/src/github.com/opencontainers/runtime-tools
path = integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools
url = https://github.com/opencontainers/runtime-tools.git
ignore = dirty

8
integration_test.sh
View File

@ -4,7 +4,7 @@ ROOT=$(pwd)
RUNTIME=${ROOT}/youki
PATTERN=${1:-.}
cd integration_test/src/github.com/opencontainers/runtime-tools
cd integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools
test_cases=(
"create/create.t"
@ -86,8 +86,8 @@ check_environment() {
}
for case in "${test_cases[@]}"; do
if [[ ! -e "${ROOT}/integration_test/src/github.com/opencontainers/runtime-tools/validation/$case" ]]; then
GO111MODULE=auto GOPATH=${ROOT}/integration_test make runtimetest validation-executables
if [[ ! -e "${ROOT}/integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools/validation/$case" ]]; then
GO111MODULE=auto GOPATH=${ROOT}/integration_test/runtime-tools make runtimetest validation-executables
break
fi
done
@ -106,7 +106,7 @@ for case in "${test_cases[@]}"; do
echo "Running $case"
logfile="./log/$case.log"
mkdir -p "$(dirname $logfile)"
sudo RUST_BACKTRACE=1 RUNTIME=${RUNTIME} ${ROOT}/integration_test/src/github.com/opencontainers/runtime-tools/validation/$case >$logfile 2>&1 || (cat $logfile && exit 1)
sudo RUST_BACKTRACE=1 RUNTIME=${RUNTIME} ${ROOT}/integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools/validation/$case >$logfile 2>&1 || (cat $logfile && exit 1)
if [ 0 -ne $(grep "not ok" $logfile | wc -l ) ]; then
cat $logfile
exit 1

0
integration_test/src/github.com/opencontainers/runtime-tools → integration_test/runtime-tools/src/github.com/opencontainers/runtime-tools
View File