From a7f9356d8bb857f45ef929cc11a715399f50d833 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 9 Sep 2016 14:33:56 -0400 Subject: [PATCH 1/3] Fix unzip test --- cryptest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index dd4edac0..1c520f67 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -5300,8 +5300,8 @@ if [[ ("$HAVE_ZIP" -ne "0") ]]; then OLD_DIR=$(pwd) "$MAKE" zip - RESULT=$(unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/") - if [[ "$RESULT" -eq "0" ]]; then + unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/" + if [[ "$?" -eq "0" ]]; then cd "$TMP/cryptopp563-zip/" ############################################ From 001f6fcc591cc81f0b3007e02807a915505a8a7f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 9 Sep 2016 14:36:55 -0400 Subject: [PATCH 2/3] Discard output from 'make zip' --- cryptest.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index 1c520f67..4ecf3818 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -174,10 +174,10 @@ do elif [[ ($("$EGREP" -ix "farm" <<< "$ARG") || $("$EGREP" -ix "nice" <<< "$ARG")) ]]; then WANT_NICE=1 elif [[ ($("$EGREP" -ix "orig" <<< "$ARG") || $("$EGREP" -ix "original" <<< "$ARG") || $("$EGREP" -ix "config.h" <<< "$ARG")) ]]; then - git checkout config.h &>/dev/null + git checkout config.h > /dev/null 2>&1 WANTED_CONFIG=1 elif [[ ($("$EGREP" -ix "rec" <<< "$ARG") || $("$EGREP" -ix "recommend" <<< "$ARG") || $("$EGREP" -ix "config.recommend" <<< "$ARG")) ]]; then - git checkout config.recommend &>/dev/null + git checkout config.recommend > /dev/null 2>&1 cp config.recommend config.h WANTED_CONFIG=1 else @@ -473,9 +473,9 @@ fi rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ (-z "$HAVE_UBSAN") ]]; then HAVE_UBSAN=0 - "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null + "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then - "$TMP/adhoc.exe" &>/dev/null + "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then HAVE_UBSAN=1 fi @@ -486,9 +486,9 @@ fi rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ (-z "$HAVE_ASAN") ]]; then HAVE_ASAN=0 - "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null + "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then - "$TMP/adhoc.exe" &>/dev/null + "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then HAVE_ASAN=1 fi @@ -499,9 +499,9 @@ fi rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ (-z "$HAVE_BOUNDS_SAN") ]]; then HAVE_BOUNDS_SAN=0 - "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=bounds-strict adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null + "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=bounds-strict adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then - "$TMP/adhoc.exe" &>/dev/null + "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ ("$?" -eq "0") ]]; then HAVE_BOUNDS_SAN=1 fi @@ -635,11 +635,11 @@ if [[ (-z "$HAVE_ZIP") ]]; then UNZIP_PROG=$(which unzip 2>&1 | "$GREP" -v "no unzip" | head -1) if [[ (! -z "$ZIP_PROG" && ! -z "$UNZIP_PROG") ]]; then HAVE_ZIP=1 - zip -v &>/dev/null + zip -v > /dev/null 2>&1 if [[ "$?" -ne "0" ]]; then HAVE_ZIP=0 fi - unzip -v &>/dev/null + unzip -v > /dev/null 2>&1 if [[ "$?" -ne "0" ]]; then HAVE_ZIP=0 fi @@ -5298,9 +5298,9 @@ fi if [[ ("$HAVE_ZIP" -ne "0") ]]; then OLD_DIR=$(pwd) - "$MAKE" zip + "$MAKE" zip > /dev/null 2>&1 - unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/" + unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/" > /dev/null 2>&1 if [[ "$?" -eq "0" ]]; then cd "$TMP/cryptopp563-zip/" From 800b27857a80aadf1354c2d9b27b5b07502457d5 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 9 Sep 2016 15:08:06 -0400 Subject: [PATCH 3/3] Remove comment with #-sign --- vs2010.zip | Bin 20184 -> 20181 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/vs2010.zip b/vs2010.zip index 20f75a927a955a01ca62cab1bacc662f2e2190a8..926b0bb287efe121ce056d9068badd70c4a62186 100644 GIT binary patch delta 746 zcmcaHm+|Uc#tFugCwdESbhBn=dR8&HnOU7Zf#Y&G5O3bdY|RT2dnbSplM$TH1rpmU zjSzb+eMJN$cF;f#uJ@gR7#qmk&En=PEMSJ7^=oD@L&ttLSZeYu*S+-*D>OY%9*Q`= zoRNW{n~i~in?Z)5tk^jxH8D>wIX5LVgp+|e6zHBvATF)oW?*Fb3RKA=!oa}LJ0(8* zwt>je`@H}7raQ#31v+j2ntNgY!q&26zu9jU1yWwB1!_mnQrUj@v|aV$opNV4sM!BF z`h5B7;=Yvm3b!?Xn9YA)A6Zz*Ehc*>Hdg7Xr?n}^(Hm`^sZQQJ9Or)o$ z%cT0N&G`3fa!pUelez6n_TG%^oO%D2XW%xo!yMC%n%;!AUvuR+Ro*4Ith7Fbf2rw8 z4ds}tGiEr=xWrWHz4humDRr|cmfX^dwSHJ%tX`%4tD|=Aicg9m)1Rd-TK892@z1^= zO`Uel#=ETk_hty!9ew^^@505LZ;}~j6D#?Sr-*(0ePl}@Kj&%B6TABy=YD*mP=Ceq z#P4Te>ORLg-&=T;l(px4`twhP&wpV~OXd@Y-M^=&FMD+8z!z&DarVc08*;X-4wTRc zP}(ZtT-WjIaUf5H^*Coy@3hYUCg9QT;a1WGY6 z-lojJlr}lgR|dr0gv#acL6ME~F@Y*p*u2%JkdYT9?MycIQw60IkXe(<{p1)cCr|UU LVf*O?OeqWiW{*ht delta 745 zcmcaQm+{72#tFvEu4gW8H1lR=x}7z-nOU9r?fXlUH+YC_KFF-i3le)LfDqFW?B@cB z?UhD|{gyr=0unoDpa$3b&wz~$WbS5ma}gFWL(cj)GngS`zZxtx`IPI~`Ylyi04kq+ z(f_uAz_I(vPwOpMzp}2(JIa3dSbp1TYOyihIw0=b_VsEhi-MD$ zE9(EO+xdIn?$hZh(X98=HrJb+T>tLCqUPVPXa9WlN$tPMuftzWeEIH8H1QOEHAj%O zr&wbC;R?RT*$p{Yj21sNTzD(Zc}JIMvqkjkM45R0M_Ju!p9A|29FOCO4(2QlFJ9O% zv+C`omc?&8SSR0)oy31hx$=GOrF(hHkDTc)3lizQSl8k$>F{lp^J^xSr_o0_>MvVe zaL)AgI>iw#>b6Q?*%pU;0cTz3N~>R+V#%Go*sEgg3)@iD+9T^`u6VRCKW3Kr#KO1p z86N(A#HalE&Dx87pW{2#9){Qad*9%<>~in|(e|UPb0%gUcrSd}&DKT7UGcpY%hqFy zTmP(DJmLGB-N(YJA%Ra;`WPEqMEPX{Y8+1B0J@lYcty^wxQG z*61~R(G(Bewh8kW{VEV*DodAl-gF^H`qIhCv1xZL#l`Kv91G}szq#yB_@r|G&u?Ex zZ&i#AcbgeszMc1Sdg)iT=PRZbuAVs|!};RAfNv4m{(o2lyqQ@h=lMxYp6VgP905!h zTRavsff7xmx9Q}K9>SA+c|g4NC_GjlWVvV`6NpNI&6|7*8F^8X&SV2WRZv2iJkeWb Va*3ZDW6k8rel~1>ynqRX0RXb$RI&g7