# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20090219085647-71ivuplfxviiszi5 # target_branch: http://www.squid-cache.org/bzr/squid3/trunk # testament_sha1: 93b5dd1cd1f1b7c83a3244e02f627e225e37cd89 # timestamp: 2009-02-19 09:57:04 +0100 # base_revision_id: rousskov@measurement-factory.com-20090219063840-\ # tfo2bh5i9obd9csi # # Begin patch === modified file 'test-suite/buildtest.sh' --- test-suite/buildtest.sh 2009-02-08 05:57:17 +0000 +++ test-suite/buildtest.sh 2009-02-19 08:56:47 +0000 @@ -11,6 +11,14 @@ # Figure out where to log the test output log=`echo "${dist}" | sed s/..test-suite.buildtests.//g ` +#if we are on Linux, let's try parallelizing +pjobs="" #default +if [ -e /proc/cpuinfo ]; then + ncpus=`grep '^processor' /proc/cpuinfo | tail -1|awk '{print $3}'` + ncpus=`expr $ncpus + 1` + pjobs="-j$ncpus" +fi + # ... and send everything there... { @@ -37,8 +45,8 @@ # rm -f -r src/fs/aufs/.deps src/fs/diskd/.deps && ../configure --silent ${OPTS} 2>&1 && - make check 2>&1 && - make 2>&1 + make $pjobs check 2>&1 && + make $pjobs 2>&1 } 2>&1 > ./buildtest_${log}.log # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQoRk1QAAalfgEAwXe///3sE AAv////+UAQ6rt1eape7vS9vdx7hkhFGaTxGp+lPNSekz0p6mgNDQNMNQDaglElPymap+Ip4mkeo 0DRoaAeoAAABJCBJpknlJtCeRNAwEABkGgaA2pFGU8ARNkjTT0hp6mmQADQAAEkoaDUw0FMmmpsm KeU/Kh6Q02kaANAZElItn7tfD4qNbsrQ4Ovsa6ysMrmps3okgy2bYav3wx+CpiBwG9Du9BJx7da2 27dMQvc2pqIh4cAjZEgRKXwTwRyQ9Np14rztfV+/pppLPBqUfmh5m/nKQX/1z0saZYPGWqKbeP7T X2BiV+JKp2rAOXKgtQZ0sHOqhLqVHJ/KToqXnE43/ZlR2I05wtUU5mgjxkrPv8Bv0A8iWTQroYO5 QJi1wXun03HIC0HkyEWJ2zJ8NBmTLnupYmKUiBEh2dTaiKqOb1Y/CM4TGc0zWqfpWwGvxfAyhqdu Z6BKJFikwvLCrJsGswK+pOUILGs9plOCZS6QOWmwlZkvzydOWrqD4Vl5PdRUm8arywacZ2RrpVFp UmhMdDyoWBAmjLh5IbyzrJXXkYeRV4w4Wz3CuiNlxeMcFZduJq8CcjTxVFUl4x0rMbDlYSiuzVsU 7RTDE4iRVcmCtsxJwZsdFoUCrPd493GiFiUQWIRUJjUmlNNaenkjGhDvxic+0iYXaxaYXDjGItgd ThFTy9p0REnKbg8S706XBq1QzJu7a9XD5TvWThFm4SVtLb7xwQNpA7uyiRLR51ZxLDSE2juN0iwH REz10MJw9TqumXnl+85isR5nVZqcD4tjZa0OHlB1HjKIO/wVxH4MUsXNEP4esJ7hUOpVVlZLL0Zx VOm0FZGIfKxNbFUMweQ3wFG9gfXYSuV4a2tmEUDQGclgfgTomvAk1oSxJgDOuV2FhNQjEcQoSbQi iOqjmvDlcVvGlRE1V+YDf9nK+ap8Gk4jUmc2nYRGtT5EZktxSK7W2DZMA4zVovVhxKlFmvIYsQzk mCNvmbDNQiaTSLSrDxLeQH9ROZJUD/VuN4s5QiCmOmgKHEI0rPL+GqaeiwCoDzCp37BaJWN3ywNR xDlEnaDqS20vbpXONMS1aHml4Z2ZqiypDoZ2Y6K1dfqvH0rSFfxXLLjxNl06848TYRuHKUO4/BQK VcNjJQ0JMyGR4Y62GZezmqQvCEoT2DAenKVGv0BUlUuuMMsJ6zhT2kj3IXOcYBfApHY7MDKnrdEL kwBHA1NoAEdtFYyTj+udDqpHo8Z8NlLD5AlimeMSPclqxqBQMNRkYYnc89R1zJEqjNmPdyJjA3l5 QHoqpuZKli5Mk4NN9KsLp6YurCZ1vzeZPaaNc7pX+pG9Q0dKfX5xzC8MN1MVzejFWVMYNPmA1o4S nLh7BQEgpSmAxHMSwS4CQlLcZ3jUIiW13KhoYzI6L4Ko/ECqAZJNOr/F3JFOFCQChGTVAA==