-# if Intel, then also run all test cases under emulation
-if [ `machine` = "pentium4" ]
-then
- echo ""
- echo " * * * Running all unit tests for emulated 32-bits * * *"
-
- # make clean
- ../bin/make-recursive.pl clean > /dev/null
+ # if 64-bit capable Intel, then also run all test cases for 64-bits
+ if [ `sysctl -n hw.optional.x86_64` = "1" ]
+ then
+ echo ""
+ echo " * * * Running all unit tests x86_64 built for $OSVERSION * * *"
+
+ # make clean
+ ../bin/make-recursive.pl clean > /dev/null
+
+ # build x86_64 architecture
+ ../bin/make-recursive.pl ARCH="x86_64" OS_VERSION=$OSVERSION OS_NAME=MacOSX | ../bin/result-filter.pl
+ fi
+
+done
+
+# restore crash reporter state
+defaults write com.apple.CrashReporter DialogType ${CRSTATE}