diff options
| -rwxr-xr-x | BUILD/compile-pentium | 1 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug | 1 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-gcov | 1 | ||||
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 8 | ||||
| -rwxr-xr-x | Build-tools/Do-rpm | 1 | ||||
| -rw-r--r-- | mysql-test/README | 29 | ||||
| -rw-r--r-- | mysql-test/README.gcov | 11 |
7 files changed, 48 insertions, 4 deletions
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium index 65257333720..2197ca28628 100755 --- a/BUILD/compile-pentium +++ b/BUILD/compile-pentium @@ -1,3 +1,4 @@ +AM_MAKEFLAGS="-j 2" make -k clean /bin/rm -f */.deps/*.P config.cache diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index c031ad466ab..beae200ea31 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -1,3 +1,4 @@ +AM_MAKEFLAGS="-j 2" make -k clean /bin/rm -f */.deps/*.P config.cache diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov index 7a833a4e18f..2137798389b 100755 --- a/BUILD/compile-pentium-gcov +++ b/BUILD/compile-pentium-gcov @@ -1,3 +1,4 @@ +AM_MAKEFLAGS="-j 2" make -k clean /bin/rm -f */.deps/*.P config.cache diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index ba6b93672ed..d52aeb4f18c 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -10,7 +10,7 @@ to_host=`hostname` cc=gcc ccc=gcc EXTRA_CONFIG="--without-perl" - +AM_MAKEFLAGS="-j 2" echo "Building on $to_host" rm -rf $BD/* @@ -34,7 +34,7 @@ umask 002 CC=$cc CXX=$ccc export CC CXX -gmake -k distclean +gmake -j 2 -k distclean rm -f NEW-RPMS/* # Stop on error @@ -61,9 +61,9 @@ aclocal; autoheader; aclocal; automake; autoconf --enable-thread-safe-client \ --without-berkeley-db -gmake -j 2 # --jobs=4 does not work. +gmake -j 2 . -time gmake distcheck \ +time gmake -j 2 distcheck \ EXTRA_CONF_ARGS="--with-unix-socket-path=/var/tmp/mysql.sock --with-low-memory $EXTRA_CONFIG" sh $BD/Build-tools/Do-rpm diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm index f1847604840..e480a6f8344 100755 --- a/Build-tools/Do-rpm +++ b/Build-tools/Do-rpm @@ -19,6 +19,7 @@ DBD_MYSQL_VERSION="1.2209" MAKERPM="$rpmdir/SOURCES/makerpm.pl" ####################### +AM_MAKEFLAGS="-j 2" VER=`grep "AM_INIT_AUTOMAKE(mysql, " $bpath/configure.in | \ sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;'` diff --git a/mysql-test/README b/mysql-test/README new file mode 100644 index 00000000000..35ab424190e --- /dev/null +++ b/mysql-test/README @@ -0,0 +1,29 @@ +This directory contains a test suite for mysql daemon. To run +the currently existing test cases, simply execute ./mysql-test-run in +this directory. It will fire up the newly built mysqld and test it. +Note that you do not have to have to do make install, and you could +actually have a co-existing MySQL installation - the tests will not +conflict with it. + +All tests must pass. If one or more of them fail on your system, please +report the details to bugs@lists.mysql.com + +You can create your own test cases. To create a test case: + + cd t + vi test_case_name.test + + in the file, put a set of SQL commands that will create some tables, + load test data, run some queries to manipulate it. + + then do ./mysql-test-run -record test_case_name + and look at r/test_case_name.result - edit the result if necessary. If you + have to edit it, you have found a bug. + +To submit your test case, put your .test file and .result file(s) into +a tar.gz archive, add a README that explains the problem, ftp the +archive to ftp://support.mysql.com/pub/mysql/secret/ and send a mail +to bugs@lists.mysql.com + + + diff --git a/mysql-test/README.gcov b/mysql-test/README.gcov new file mode 100644 index 00000000000..83ddd6df2e1 --- /dev/null +++ b/mysql-test/README.gcov @@ -0,0 +1,11 @@ +To be able to see the level of coverage with the current test suite, +do the following: + + - make sure gcov is installed + - compile with BUILD/compile-pentium-gcov ( if your machine is not pentium, hack +this script, or just live with the pentium-specific stuff) + - ./mysql-test-run -gcov + - to see the level of coverage for a given source file: + grep source_file_name /tmp/gcov.out + - to see which lines are not yet covered, look at source_file_name.gcov in the source tree. Then think hard about a test case that will cover those +lines, and write one! |