diff options
| author | Ewan Mellor <ewan@xensource.com> | 2006-11-01 09:21:27 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2006-11-01 09:21:27 +0000 |
| commit | e1502fb42286b8a824b900b2ce81e13ca809d38a (patch) | |
| tree | 41be61a400838b9ecdf39c73977ca418e830641d /tools/xm-test | |
| parent | 9855faf0045478e309adbb98826f517d434f94f8 (diff) | |
| download | xen-e1502fb42286b8a824b900b2ce81e13ca809d38a.tar.gz xen-e1502fb42286b8a824b900b2ce81e13ca809d38a.tar.bz2 xen-e1502fb42286b8a824b900b2ce81e13ca809d38a.zip | |
Allow the i386 ramdisk to be used on x86_64. Part of a patch from Yu Ping Y.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools/xm-test')
| -rwxr-xr-x | tools/xm-test/runtest.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/xm-test/runtest.sh b/tools/xm-test/runtest.sh index 7008972fae..f882b04007 100755 --- a/tools/xm-test/runtest.sh +++ b/tools/xm-test/runtest.sh @@ -78,7 +78,13 @@ runnable_tests() { eval $(./lib/XmTestReport/xmtest.py) ARCH=$(uname -m | sed -e s/i.86/i386/ -e 's/ppc\(64\)*/powerpc/') rrdver="initrd-${XM_TEST_MAJ}.${XM_TEST_MIN}-${ARCH}.img" - if [ "$realrd" != "$rrdver" ]; then + exp_flag=0 + realarch=`echo $realrd | awk -F- '{print $3}' | awk -F. '{print $1}'` + rrdarch=`echo $rrdver | awk -F- '{print $3}' | awk -F. '{print $1}'` + if [ "$realarch" = "i386" -a "$rrdarch" = "x86_64" ]; then + exp_flag=1 + fi + if [ $exp_flag -eq 0 -a "$realrd" != "$rrdver" ]; then echo "Error: ramdisk/initrd.img is from an old version, or is not for this " echo "architecture ($ARCH)." echo "You need to build a ramdisk from at least ${XM_TEST_MAJ}.${XM_TEST_MIN}" |