summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-13 07:24:47 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-13 08:27:51 (GMT)
commit13cbcc0ddca0fdd5be9ede09052d31785c1e4d55 (patch)
treeb647be5699145ccae1545096aba5c495d96f8eb5 /config.tests
parent081078137a6fbc85d6be1437f6afc1d60e4f75f9 (diff)
parentde088b5a7f7b57e568399334667b14bfc9e7b893 (diff)
downloadQt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.zip
Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.gz
Qt-13cbcc0ddca0fdd5be9ede09052d31785c1e4d55.tar.bz2
Merge commit 'qt/master'
Conflicts: examples/opengl/samplebuffers/glwidget.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer.cpp src/gui/gui.pro tests/auto/qhttp/tst_qhttp.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp
Diffstat (limited to 'config.tests')
-rwxr-xr-xconfig.tests/mac/crc.test6
-rwxr-xr-xconfig.tests/unix/compile.test6
-rwxr-xr-xconfig.tests/unix/doubleformat.test2
-rwxr-xr-xconfig.tests/unix/endian.test4
-rwxr-xr-xconfig.tests/unix/ptrsize.test4
-rwxr-xr-xconfig.tests/x11/notype.test4
6 files changed, 13 insertions, 13 deletions
diff --git a/config.tests/mac/crc.test b/config.tests/mac/crc.test
index 1a16204..644ff75 100755
--- a/config.tests/mac/crc.test
+++ b/config.tests/mac/crc.test
@@ -52,13 +52,13 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-make distclean >/dev/null 2>&1
+$MAKE distclean >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
index 550890f..67a4636 100755
--- a/config.tests/unix/compile.test
+++ b/config.tests/unix/compile.test
@@ -64,14 +64,14 @@ test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
cd "$OUTDIR/$TEST"
-test -r Makefile && make distclean >/dev/null 2>&1
+test -r Makefile && $MAKE distclean >/dev/null 2>&1
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
[ -x "$EXE" ] && SUCCESS=yes
diff --git a/config.tests/unix/doubleformat.test b/config.tests/unix/doubleformat.test
index 3e707c5..953efd8 100755
--- a/config.tests/unix/doubleformat.test
+++ b/config.tests/unix/doubleformat.test
@@ -14,7 +14,7 @@ test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tes
cd "$OUTDIR/config.tests/unix/doubleformat"
DOUBLEFORMAT="UNKNOWN"
-[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
if [ -f ./doubleformattest ]; then
: # nop
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test
index 2c21652..4755b1f 100755
--- a/config.tests/unix/endian.test
+++ b/config.tests/unix/endian.test
@@ -15,7 +15,7 @@ cd "$OUTDIR/config.tests/unix/endian"
ENDIAN="UNKNOWN"
-[ "$VERBOSE" = "yes" ] && make || make >/dev/null 2>&1
+[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
if [ -f ./endiantest.exe ]; then
binary=./endiantest.exe
@@ -40,7 +40,7 @@ elif strings $binary | grep MostSignificantByteFirst >/dev/null 2>&1; then
fi
# make clean as this tests is compiled for both the host and the target
-make distclean
+$MAKE distclean
# done
if [ "$ENDIAN" = "LITTLE" ]; then
diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test
index 1307cec..c1d80ee 100755
--- a/config.tests/unix/ptrsize.test
+++ b/config.tests/unix/ptrsize.test
@@ -14,9 +14,9 @@ test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/un
cd "$OUTDIR/config.tests/unix/ptrsize"
if [ "$VERBOSE" = "yes" ]; then
- (make clean && make)
+ ($MAKE clean && $MAKE)
else
- (make clean && make) >/dev/null 2>&1
+ ($MAKE clean && $MAKE) >/dev/null 2>&1
fi
RETVAL=$?
diff --git a/config.tests/x11/notype.test b/config.tests/x11/notype.test
index a522491..3a01d8f 100755
--- a/config.tests/x11/notype.test
+++ b/config.tests/x11/notype.test
@@ -31,9 +31,9 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLATFORM = "hpux-g++" -o $XPLATFORM = "aix-
cd "$OUTDIR/config.tests/x11/notype"
if [ "$VERBOSE" = "yes" ]; then
- make
+ $MAKE
else
- make >/dev/null 2>&1
+ $MAKE >/dev/null 2>&1
fi
[ -x notypetest ] && NOTYPE=no