mirror of
https://github.com/shadps4-emu/ext-cryptopp.git
synced 2024-11-27 11:50:29 +00:00
Fix Solaris 10 script and compiler issues
This commit is contained in:
parent
e39226e511
commit
54fc79ec6a
20
cryptest.sh
20
cryptest.sh
@ -127,6 +127,14 @@ if [[ ((-z "$CXX") || ("$CXX" == "gcc")) ]]; then
|
||||
CXX=/opt/solarisstudio12.3/bin/CC
|
||||
elif [[ (-e "/opt/solstudio12.2/bin/CC") ]]; then
|
||||
CXX=/opt/solstudio12.2/bin/CC
|
||||
elif [[ (-e "/opt/solstudio12.1/bin/CC") ]]; then
|
||||
CXX=/opt/solstudio12.1/bin/CC
|
||||
elif [[ (-e "/opt/solstudio12.0/bin/CC") ]]; then
|
||||
CXX=/opt/solstudio12.0/bin/CC
|
||||
elif [[ (! -z $(which CC 2>/dev/null | "$GREP" -v "no CC" | head -1)) ]]; then
|
||||
CXX=$(which CC | head -1)
|
||||
elif [[ (! -z $(which g++ 2>/dev/null | "$GREP" -v "no g++" | head -1)) ]]; then
|
||||
CXX=$(which g++ | head -1)
|
||||
else
|
||||
CXX=CC
|
||||
fi
|
||||
@ -429,7 +437,11 @@ fi
|
||||
|
||||
# ld-gold linker testing
|
||||
if [[ (-z "$HAVE_LDGOLD") ]]; then
|
||||
HAVE_LDGOLD=$(file `which ld.gold 2>&1` 2>/dev/null | "$GREP" -v "no ld.gold" | cut -d":" -f 2 | "$EGREP" -i -c "elf")
|
||||
HAVE_LDGOLD=0
|
||||
LD_GOLD=$(which ld.gold 2>/dev/null | "$GREP" -v "no ld.gold" | head -1)
|
||||
if [[ (! -z "$LD_GOLD") ]]; then
|
||||
HAVE_LDGOLD=$(file "$LD_GOLD" | cut -d":" -f 2 | "$EGREP" -i -c "elf")
|
||||
fi
|
||||
fi
|
||||
|
||||
# Valgrind testing of C++03, C++11, C++14 and C++17 binaries. Valgrind tests take a long time...
|
||||
@ -4215,7 +4227,7 @@ echo "************************************************" | tee -a "$TEST_RESULTS"
|
||||
echo "************************************************" | tee -a "$TEST_RESULTS"
|
||||
echo | tee -a "$TEST_RESULTS"
|
||||
|
||||
COUNT=$("$GREP" -a 'Testing:' "$TEST_RESULTS" "$WARN_RESULTS" | wc -l | "$AWK" '{print $1}')
|
||||
COUNT=$("$GREP" 'Testing:' "$TEST_RESULTS" "$WARN_RESULTS" | wc -l | "$AWK" '{print $1}')
|
||||
if (( "$COUNT" == "0" )); then
|
||||
echo "No configurations tested" | tee -a "$TEST_RESULTS"
|
||||
else
|
||||
@ -4239,7 +4251,7 @@ echo | tee -a "$TEST_RESULTS"
|
||||
# "Error" is from the GNU assembler
|
||||
# "error" is from the sanitizers
|
||||
# "Illegal", "0 errors" and "suppressed errors" are from Valgrind.
|
||||
ECOUNT=$("$EGREP" -a '(Error|ERROR|error|FAILED|Illegal)' $TEST_RESULTS | "$EGREP" -v '( 0 errors|suppressed errors|error detector)' | wc -l | "$AWK" '{print $1}')
|
||||
ECOUNT=$("$EGREP" '(Error|ERROR|error|FAILED|Illegal)' $TEST_RESULTS | "$EGREP" -v '( 0 errors|suppressed errors|error detector)' | wc -l | "$AWK" '{print $1}')
|
||||
if (( "$ECOUNT" == "0" )); then
|
||||
echo "No failures detected" | tee -a "$TEST_RESULTS"
|
||||
else
|
||||
@ -4256,7 +4268,7 @@ echo
|
||||
echo "************************************************" | tee -a "$TEST_RESULTS" "$WARN_RESULTS"
|
||||
echo | tee -a "$TEST_RESULTS" "$WARN_RESULTS"
|
||||
|
||||
WCOUNT=$("$EGREP" -a '(warning:)' $WARN_RESULTS | "$GREP" -v 'deprecated-declarations' | wc -l | "$AWK" '{print $1}')
|
||||
WCOUNT=$("$EGREP" '(warning:)' $WARN_RESULTS | "$GREP" -v 'deprecated-declarations' | wc -l | "$AWK" '{print $1}')
|
||||
if (( "$WCOUNT" == "0" )); then
|
||||
echo "No warnings detected" | tee -a "$TEST_RESULTS" "$WARN_RESULTS"
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user