diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-03-29 03:47:33 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-03-29 03:47:33 -0400 |
| commit | 34a34967ac560c1801bf3845dbac3ac63c1d4c05 (patch) | |
| tree | dd1842f8856fec7cf328b801eb47001852f34dbf | |
| parent | 2129e94b62ddb0d120991f37edb3eee0c8932ea3 (diff) | |
| download | cryptopp-git-34a34967ac560c1801bf3845dbac3ac63c1d4c05.tar.gz | |
Cleaned artifacts from testing. Move documentation clean rule to distclean
| -rwxr-xr-x | GNUmakefile | 16 | ||||
| -rwxr-xr-x | cryptest.sh | 14 |
2 files changed, 17 insertions, 13 deletions
diff --git a/GNUmakefile b/GNUmakefile index e80ab1ec..ca31f393 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -430,15 +430,13 @@ endif -$(RM) adhoc.cpp.o adhoc.cpp.proto.o $(LIBOBJS) $(TESTOBJS) $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) -$(RM) cryptest.exe dlltest.exe cryptest.import.exe cryptest.info ct rdrand-???.o -$(RM) *.gcno *.gcda *.stackdump core-* + -$(RM) /tmp/adhoc.exe +ifneq ($(wildcard /tmp/cryptopp_test/),) + -$(RM) -r /tmp/cryptopp_test/ +endif ifneq ($(wildcard *.exe.dSYM),) -$(RM) -r *.exe.dSYM/ endif -ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),) - -$(RM) -r $(DOCUMENT_DIRECTORY)/ -endif -ifneq ($(wildcard TestCoverage/),) - -$(RM) -r TestCoverage/ -endif ifneq ($(wildcard cov-int/),) -$(RM) -r cov-int/ endif @@ -451,6 +449,12 @@ distclean: clean ifneq ($(wildcard CMakeFiles/),) -$(RM) -r CMakeFiles/ endif +ifneq ($(wildcard $(DOCUMENT_DIRECTORY)/),) + -$(RM) -r $(DOCUMENT_DIRECTORY)/ +endif +ifneq ($(wildcard TestCoverage/),) + -$(RM) -r TestCoverage/ +endif ifneq ($(wildcard cryptopp$(LIB_VER)\.*),) -$(RM) cryptopp$(LIB_VER)\.* endif diff --git a/cryptest.sh b/cryptest.sh index eb2b52e4..900f4ff8 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -80,7 +80,7 @@ if [ -z "$TMP" ]; then TMP=/tmp fi -$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -Wno-deprecated-declarations adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -Wno-deprecated-declarations adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ]; then ADD_CXXFLAGS="$ADD_CXXFLAGS -Wno-deprecated-declarations" fi @@ -102,7 +102,7 @@ else fi # Set to 0 if you don't have UBsan -$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then HAVE_UBSAN=1 else @@ -110,7 +110,7 @@ else fi # Set to 0 if you don't have Asan -$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ] && [ "$IS_X86" -ne "0" ]; then HAVE_ASAN=1 else @@ -120,7 +120,7 @@ fi # Set to 0 if you don't have Intel multiarch HAVE_INTEL_MULTIARCH=0 if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_X86" -ne "0" ]; then -$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -arch i386 -arch x86_64 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x c++ -DCRYPTOPP_ADHOC_MAIN -arch i386 -arch x86_64 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ]; then HAVE_INTEL_MULTIARCH=1 fi @@ -129,7 +129,7 @@ fi # Set to 0 if you don't have PPC multiarch HAVE_PPC_MULTIARCH=0 if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_PPC" -ne "0" ]; then -$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -arch ppc -arch ppc64 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -arch ppc -arch ppc64 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ]; then HAVE_PPC_MULTIARCH=1 fi @@ -137,7 +137,7 @@ fi HAVE_X32=0 if [ "$IS_X64" -ne "0" ]; then -$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -mx32 adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 +$CXX -x -DCRYPTOPP_ADHOC_MAIN c++ -mx32 adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ]; then HAVE_X32=1 fi @@ -1711,7 +1711,7 @@ fi if [ "$CXX" == "g++" ]; then CLANG_COMPILER=$(which clang++ 2>/dev/null) - "$CLANG_COMPILER" -x c++ -DCRYPTOPP_ADHOC_MAIN adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1 + "$CLANG_COMPILER" -x c++ -DCRYPTOPP_ADHOC_MAIN adhoc.cpp.proto -o $TMP/adhoc.exe > /dev/null 2>&1 if [ "$?" -eq "0" ]; then ############################################ |