[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvz-criu
Subject:    [CRIU] [PATCH 22/22] Added support for the Debian distribution.
From:       alekskartashov () parallels ! com (Alexander Kartashov)
Date:       2012-12-27 6:51:13
Message-ID: 1356591073-26480-23-git-send-email-alekskartashov () parallels ! com
[Download RAW message or body]


Signed-off-by: Alexander Kartashov <alekskartashov at parallels.com>
---
 Makefile     |    2 ++
 test/zdtm.sh |   13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 623722d..ba55267 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/test/zdtm.sh b/test/zdtm.sh
index 2ed2c87..78a58e8 100644
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -178,15 +178,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  }
 
-- 
1.7.10.4


[prev in list] [next in list] [prev in thread] [next in thread]