From db1c95401c00cd115d0f0d73ace7facc3e38ff9e Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 4 Dec 2015 12:52:40 -0500 Subject: [PATCH] Fixed test using Xcode default compiler. Fixed makefile convert recipe to include ASM files --- GNUmakefile | 4 ++-- cryptest.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 093e0a56..1b388886 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -413,8 +413,8 @@ endif .PHONY: convert convert: -chmod 0700 TestVectors/ TestData/ - -chmod 0600 $(TEXT_FILES) *.zip - -chmod 0700 $(EXEC_FILES) + -chmod 0600 $(TEXT_FILES) *.asm *.S *.zip + -chmod 0700 $(EXEC_FILES) *.sh *.cmd -chmod 0700 *.cmd *.sh GNUmakefile GNUmakefile-cross -unix2dos --keepdate --quiet $(TEXT_FILES) *.asm *.cmd -dos2unix --keepdate --quiet GNUmakefile GNUmakefile-cross *.S *.sh diff --git a/cryptest.sh b/cryptest.sh index dda67893..eaba37d2 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -752,7 +752,7 @@ if [ "$IS_DARWIN" -ne "0" ]; then XCODE_COMPILER=$(find /Developer/Applications/Xcode.app -name clang++ 2>/dev/null | head -1) fi - if [ -z "$XCODE_COMPILER" ]; then + if [ ! -z "$XCODE_COMPILER" ]; then echo echo "************************************" | tee -a "$TEST_RESULTS" echo "Testing: Xcode Clang compiler" | tee -a "$TEST_RESULTS"