Skip to content

C
criu
Commit ee3bea7b authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov
Browse files
Options

tests: remove "live" from zdtm paths 

Signed-off-by: 's avatarAndrew Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent 6b4fb4d4
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
test/others/mem-snap/run-predump-2.sh
View file @ ee3bea7b
...@@ -15,7 +15,7 @@ mkdir "$IMGDIR" ...@@ -15,7 +15,7 @@ mkdir "$IMGDIR"
function launch_test { function launch_test {
echo "Launching test" echo "Launching test"
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make maps04 make maps04
make maps04.pid || fail "Can't start test" make maps04.pid || fail "Can't start test"
...@@ -26,7 +26,7 @@ function launch_test { ...@@ -26,7 +26,7 @@ function launch_test {
function stop_test { function stop_test {
wtime=1 wtime=1
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make maps04.stop make maps04.stop
cat maps04.out | fgrep PASS || fail "Test failed" cat maps04.out | fgrep PASS || fail "Test failed"
echo "OK" echo "OK"
......
test/others/mem-snap/run-predump.sh
View file @ ee3bea7b
...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR" ...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR"
mkdir "$IMGDIR" mkdir "$IMGDIR"
echo "Launching test" echo "Launching test"
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make mem-touch make mem-touch
make mem-touch.pid || fail "Can't start test" make mem-touch.pid || fail "Can't start test"
...@@ -70,7 +70,7 @@ done ...@@ -70,7 +70,7 @@ done
echo "Restoring" echo "Restoring"
${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server" ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server"
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make mem-touch.stop make mem-touch.stop
cat mem-touch.out | fgrep PASS || fail "Test failed" cat mem-touch.out | fgrep PASS || fail "Test failed"
......
test/others/mem-snap/run-snap-auto-dedup.sh
View file @ ee3bea7b
...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR" ...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR"
mkdir "$IMGDIR" mkdir "$IMGDIR"
echo "Launching test" echo "Launching test"
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make mem-touch make mem-touch
make mem-touch.pid || fail "Can't start test" make mem-touch.pid || fail "Can't start test"
...@@ -82,7 +82,7 @@ fi ...@@ -82,7 +82,7 @@ fi
echo "Restoring" echo "Restoring"
${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server" ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server"
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make mem-touch.stop make mem-touch.stop
cat mem-touch.out | fgrep PASS || fail "Test failed" cat mem-touch.out | fgrep PASS || fail "Test failed"
......
test/others/mem-snap/run-snap-dedup-on-restore.sh
View file @ ee3bea7b
...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR" ...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR"
mkdir "$IMGDIR" mkdir "$IMGDIR"
echo "Launching test" echo "Launching test"
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make mem-touch make mem-touch
make mem-touch.pid || fail "Can't start test" make mem-touch.pid || fail "Can't start test"
...@@ -76,7 +76,7 @@ if [[ $size_last1 -ne 0 || $size_last2 -ne 0 || $size_last3 -ne 0 ]]; then ...@@ -76,7 +76,7 @@ if [[ $size_last1 -ne 0 || $size_last2 -ne 0 || $size_last3 -ne 0 ]]; then
restore_dedup_ok=1 restore_dedup_ok=1
fi fi
cd ../../zdtm//live/static/ cd ../../zdtm/static/
make mem-touch.stop make mem-touch.stop
cat mem-touch.out | fgrep PASS || fail "Test failed" cat mem-touch.out | fgrep PASS || fail "Test failed"
......
test/others/mem-snap/run-snap-dedup.sh
View file @ ee3bea7b
...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR" ...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR"
mkdir "$IMGDIR" mkdir "$IMGDIR"
echo "Launching test" echo "Launching test"
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make mem-touch make mem-touch
make mem-touch.pid || fail "Can't start test" make mem-touch.pid || fail "Can't start test"
...@@ -88,7 +88,7 @@ fi ...@@ -88,7 +88,7 @@ fi
echo "Restoring" echo "Restoring"
${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server" ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server"
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make mem-touch.stop make mem-touch.stop
cat mem-touch.out | fgrep PASS || fail "Test failed" cat mem-touch.out | fgrep PASS || fail "Test failed"
......
test/others/mem-snap/run-snap-maps04.sh
View file @ ee3bea7b
...@@ -31,10 +31,10 @@ fi ...@@ -31,10 +31,10 @@ fi
rm -rf "$IMGDIR/*" rm -rf "$IMGDIR/*"
echo "Launching test" echo "Launching test"
make -C ../../zdtm//live/static/ cleanout make -C ../../zdtm/static/ cleanout
make -C ../../zdtm//live/static/ maps04 make -C ../../zdtm/static/ maps04
make -C ../../zdtm//live/static/ maps04.pid || fail "Can't start test" make -C ../../zdtm/static/ maps04.pid || fail "Can't start test"
PID=$(cat ../../zdtm//live/static/maps04.pid) PID=$(cat ../../zdtm/static/maps04.pid)
kill -0 $PID || fail "Test haven't started" kill -0 $PID || fail "Test haven't started"
mkdir "$IMGDIR/$NRSNAP/" mkdir "$IMGDIR/$NRSNAP/"
...@@ -55,10 +55,10 @@ fi ...@@ -55,10 +55,10 @@ fi
echo "Restoring" echo "Restoring"
${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log --auto-dedup -d -v4 || fail "Fail to restore" ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log --auto-dedup -d -v4 || fail "Fail to restore"
make -C ../../zdtm//live/static/ maps04.stop make -C ../../zdtm/static/ maps04.stop
sleep 1 sleep 1
cat "../zdtm/live/static/maps04.out" | fgrep PASS || fail "Test failed" cat "../zdtm/static/maps04.out" | fgrep PASS || fail "Test failed"
size=$(du -sh -BK dump/1/pages-*.img | grep -Eo '[0-9]+' | head -1) size=$(du -sh -BK dump/1/pages-*.img | grep -Eo '[0-9]+' | head -1)
if [ $size -ne 0 ] ; then if [ $size -ne 0 ] ; then
......
test/others/mem-snap/run-snap.sh
View file @ ee3bea7b
...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR" ...@@ -26,7 +26,7 @@ rm -rf "$IMGDIR"
mkdir "$IMGDIR" mkdir "$IMGDIR"
echo "Launching test" echo "Launching test"
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make cleanout make cleanout
make mem-touch make mem-touch
make mem-touch.pid || fail "Can't start test" make mem-touch.pid || fail "Can't start test"
...@@ -67,7 +67,7 @@ done ...@@ -67,7 +67,7 @@ done
echo "Restoring" echo "Restoring"
${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server" ${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server"
cd ../../zdtm/live/static/ cd ../../zdtm/static/
make mem-touch.stop make mem-touch.stop
cat mem-touch.out | fgrep PASS || fail "Test failed" cat mem-touch.out | fgrep PASS || fail "Test failed"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment