diff options
-rw-r--r-- | configure.ac | 12 | ||||
-rwxr-xr-x | tests/bugs/bug-884455.t | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index ad6989f8e0d..74075182438 100644 --- a/configure.ac +++ b/configure.ac @@ -524,7 +524,6 @@ AC_SUBST(GF_DISTRIBUTION) GF_HOST_OS="" GF_LDFLAGS="-rdynamic" -CFLAGS="-g" # check for gcc -Werror=format-security saved_CFLAGS=$CFLAGS @@ -600,13 +599,12 @@ AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debug build options.])) -DEBUG=no +BUILD_DEBUG=no if test "x$enable_debug" = "xyes"; then - DEBUG=yes - CFLAGS="-O0 $CFLAGS" + BUILD_DEBUG=yes + CFLAGS=`echo $CFLAGS | sed -e s/O2/O0/` else - CFLAGS="-O2 $CFLAGS" - DEBUG=no + BUILD_DEBUG=no fi AC_SUBST(CFLAGS) # end enable debug section @@ -668,7 +666,7 @@ echo "fusermount : $BUILD_FUSERMOUNT" echo "readline : $BUILD_READLINE" echo "georeplication : $BUILD_SYNCDAEMON" echo "Linux-AIO : $BUILD_LIBAIO" -echo "Enable Debug : $DEBUG" +echo "Enable Debug : $BUILD_DEBUG" echo "systemtap : $BUILD_SYSTEMTAP" echo "Block Device backend : $BUILD_BD_XLATOR" echo diff --git a/tests/bugs/bug-884455.t b/tests/bugs/bug-884455.t index c193cd8aad6..46e55dad61e 100755 --- a/tests/bugs/bug-884455.t +++ b/tests/bugs/bug-884455.t @@ -66,7 +66,7 @@ TEST ls -l $M0 2>/dev/null; TEST $CLI volume rebalance $V0 start force -EXPECT_WITHIN 15 "0" rebalance_completed +EXPECT_WITHIN 30 "0" rebalance_completed ## check for layout overlaps. EXPECT "0" get_layout $B0/${V0}0 $B0/${V0}1 $B0/${V0}2 |