Skip to content

Commit

Permalink
Test using --enable-werror for the bots
Browse files Browse the repository at this point in the history
  • Loading branch information
magnumripper committed Dec 27, 2017
1 parent 7fa0642 commit 8a022a3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
12 changes: 8 additions & 4 deletions .circle/CircleCI-MinGW.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,24 @@ echo '**************************************************************************
echo ""

# Build with AVX
mingw32 ./configure --disable-native-tests CPPFLAGS='-mavx -DCPU_FALLBACK -DCPU_FALLBACK_BINARY="\"john-sse2.exe\""' --host=i686-w64-mingw32
mingw32 ./configure --enable-werror --disable-native-tests CPPFLAGS='-mavx -DCPU_FALLBACK -DCPU_FALLBACK_BINARY="\"john-sse2.exe\""' --host=i686-w64-mingw32
if [ "x$?" != "x0" ] ; then exit 1 ; fi
mingw32 make -sj4
if [ "x$?" != "x0" ] ; then exit 1 ; fi
mv -v ../run/john ../run/john-avx.exe
make clean; make distclean

# Build with AVX2 (32-bit, see https://github.com/magnumripper/JohnTheRipper/issues/2543 for details)
mingw32 ./configure --disable-native-tests CPPFLAGS='-mavx2 -DCPU_FALLBACK -DCPU_FALLBACK_BINARY="\"john-avx.exe\""' --host=i686-w64-mingw32
mingw32 ./configure --enable-werror --disable-native-tests CPPFLAGS='-mavx2 -DCPU_FALLBACK -DCPU_FALLBACK_BINARY="\"john-avx.exe\""' --host=i686-w64-mingw32
if [ "x$?" != "x0" ] ; then exit 1 ; fi
mingw32 make -sj4
if [ "x$?" != "x0" ] ; then exit 1 ; fi
mv -v ../run/john ../run/john-avx2.exe
make clean; make distclean

# Build with SSE2 only
# mingw64 ./configure --disable-native-tests CPPFLAGS='-mno-ssse3' --host=x86_64-w64-mingw32
mingw32 ./configure --disable-native-tests CPPFLAGS='-mno-ssse3' --host=i686-w64-mingw32
mingw32 ./configure --enable-werror --disable-native-tests CPPFLAGS='-mno-ssse3' --host=i686-w64-mingw32
# mingw64 ./configure --host=x86_64-w64-mingw32
if [ "x$?" != "x0" ] ; then exit 1 ; fi
mingw64 make -sj4
Expand Down Expand Up @@ -143,7 +147,7 @@ echo '**************************************************************************
echo ""
cd /base/JohnTheRipper/src
make -s distclean
CFLAGS_EXTRA="-fstack-protector-all" ./configure --disable-simd
CFLAGS_EXTRA="-fstack-protector-all" ./configure --enable-werror --disable-simd
if [ "x$?" != "x0" ] ; then exit 1 ; fi
make -sj4
if [ "x$?" != "x0" ] ; then exit 1 ; fi
Expand Down
10 changes: 5 additions & 5 deletions .travis/check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# brew install --force openssl
cd src

./configure CPPFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib"
./configure --enable-werror CPPFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib"
make -sj4

../.travis/test.sh
Expand Down Expand Up @@ -35,7 +35,7 @@ elif [[ -z "$TEST" || "$TEST" == "encoding" ]]; then
fi

# Configure and build
./configure $ASAN
./configure --enable-werror $ASAN
make -sj4

../.travis/test.sh "$TEST"
Expand All @@ -46,7 +46,7 @@ elif [[ "$TEST" == "fresh test" ]]; then
cd /cwd/src; \
apt-get update -qq; \
apt-get install -y build-essential libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev libbz2-dev libomp-dev; \
./configure --enable-asan; \
./configure --enable-werror --enable-asan; \
make -sj4; \
export OPENCL="""$OPENCL"""; \
PROBLEM='slow' ../.travis/test.sh
Expand All @@ -61,7 +61,7 @@ elif [[ "$TEST" == "TS --restore" ]]; then
sudo apt-get install libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev

# Configure and build
./configure
./configure --enable-werror
make -sj4

cd ..
Expand All @@ -78,7 +78,7 @@ elif [[ "$TEST" == "TS docker" ]]; then
cd /cwd/src; \
apt-get update -qq; \
apt-get install -y build-essential libssl-dev yasm libgmp-dev libpcap-dev pkg-config debhelper libnet1-dev libbz2-dev git; \
./configure; \
./configure --enable-werror; \
make -sj4; \
cd ..; \
git clone --depth 1 https://github.com/magnumripper/jtrTestSuite.git tests; \
Expand Down

0 comments on commit 8a022a3

Please sign in to comment.