diff -r b3d94f4ddffe tools/xm-test/lib/XmTestReport/arch.py --- a/tools/xm-test/lib/XmTestReport/arch.py Sat Oct 28 11:30:38 2006 +++ b/tools/xm-test/lib/XmTestReport/arch.py Wed Nov 1 10:07:20 2006 @@ -28,6 +28,7 @@ "i486" : "x86", "i586" : "x86", "i686" : "x86", + "x86_64" : "x86_64", "ia64" : "ia64", "ppc" : "powerpc", "ppc64" : "powerpc", @@ -35,6 +36,9 @@ _arch = _uname_to_arch_map.get(os.uname()[4], "Unknown") if _arch == "x86": + cpuValues = {"model_name" : "Unknown", + "flags" : "Unknown"} +elif _arch == "x86_64": cpuValues = {"model_name" : "Unknown", "flags" : "Unknown"} elif _arch == "ia64": diff -r b3d94f4ddffe tools/xm-test/runtest.sh --- a/tools/xm-test/runtest.sh Sat Oct 28 11:30:38 2006 +++ b/tools/xm-test/runtest.sh Wed Nov 1 10:07:20 2006 @@ -78,7 +78,13 @@ 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}"