mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 18:07:57 +00:00
Code Issues Releases Wiki Activity

Test suite: added support for the Debian distribution.

Browse Source 
* Replaced the shell interpreter with bash to run
  the script test/zdtm.sh correctly.

* Added new directories into the routine contruct_root()
  searched by the Debian version of the dynamic linker.

Signed-off-by: Alexander Kartashov <alekskartashov@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Alexander Kartashov 2013-01-10 20:12:44 +04:00 committed by Pavel Emelyanov
parent 60066f2dbb
commit 0fd2d39230
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -20,7 +20,7 @@ CC := gcc
ECHO := echo
NM := nm
AWK := awk
SH := sh
SH := bash
MAKE := make
OBJCOPY := objcopy
@ -190,6 +190,8 @@ clean:
$(Q) $(RM) -rf ./test/dump/
$(Q) $(RM) -f ./*.gcov ./*.gcda ./*.gcno
$(Q) $(RM) -rf ./gcov
$(Q) $(RM) -rf ./test/lib/
$(Q) $(RM) -rf ./test/lib64/
$(Q) $(MAKE) -C protobuf/ clean
$(Q) $(MAKE) -C arch/$(ARCH)/ clean
$(Q) $(MAKE) -C pie/ clean

13
test/zdtm.sh
View File

@ -180,15 +180,18 @@ construct_root()
{
local root=$1
local test_path=$2
local libdir=$root/lib64
local libdir=$root/lib
local libdir2=$root/lib64
mkdir $libdir
mkdir $libdir $libdir2
for i in `ldd $test_path | awk '{ print $1 }' | grep -v vdso`; do
local lib=`basename $i`
[ -f $libdir/$lib ] && continue ||
[ -f $i ] && cp $i $libdir && continue ||
[ -f /lib64/$i ] && cp /lib64/$i $libdir && continue ||
[ -f /usr/lib64/$i ] && cp /usr/lib64/$i $libdir || return 1
[ -f $i ] && cp $i $libdir && cp $i $libdir2 && continue ||
[ -f /lib64/$i ] && cp /lib64/$i $libdir && cp /lib64/$i $libdir2 && continue ||
[ -f /usr/lib64/$i ] && cp /usr/lib64/$i $libdir && cp /usr/lib64/$i $libdir2 && continue ||
[ -f /lib/x86_64-linux-gnu/$i ] && cp /lib/x86_64-linux-gnu/$i $libdir && cp /lib/x86_64-linux-gnu/$i $libdir2 && continue ||
[ -f /lib/arm-linux-gnueabi/$i ] && cp /lib/arm-linux-gnueabi/$i $libdir && cp /lib/arm-linux-gnueabi/$i $libdir2 && continue || echo "Failed at " $i && return 1
done
}