quiet spurious printouts, clean up Makefile

git-svn-id: file:///svn/toku/tokudb@23002 c7de825b-a66e-492c-adef-691d508d4ae1

src/tests/Makefile

@@ -667,11 +667,17 @@ test_thread_stack.%run: test_thread_stack.%$(BINSUF) $(PTHREAD_LOCAL)
 	./$< -a -thread_stack 16384         && \
 	./$< -a -thread_stack 16384 -resume $(SUMMARIZE_CMD)
 
-# Need an extra test for the loader (-r 5000 -s) to manifest #2717.
-loader-stress-test.loader: loader-stress-test.tdb$(BINSUF) $(PTHREAD_LOCAL)
-	$(TDBVGRIND) ./$< $(EXTRA_ARGS) $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
-	$(TDBVGRIND) ./$< $(EXTRA_ARGS) -p $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
-	$(TDBVGRIND) ./$< $(EXTRA_ARGS) -r 5000 -s $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
+loader-stress-test.loader: $(patsubst %,loader-stress-test%.tdbrun, 0 1 2)
+	true
+
+loader-stress-test0.tdbrun: loader-stress-test.tdb$(BINSUF)
+	$(TDBVGRIND) ./$< $(EXTRA_ARGS) -c $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
+
+loader-stress-test1.tdbrun: loader-stress-test.tdb$(BINSUF)
+	$(TDBVGRIND) ./$< $(EXTRA_ARGS) -c -p $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD)
+
+loader-stress-test2.tdbrun: loader-stress-test.tdb$(BINSUF) 
+	$(TDBVGRIND) ./$< $(EXTRA_ARGS) -r 5000 -s $(VERBVERBOSE) $(MAYBEINVERTER) $(SUMMARIZE_CMD) # to manifest #2717.
 
 loader-dup-test.loader loader-dup-test.tdbrun: $(patsubst %,loader-dup-test%.tdbrun, 0 1 2 3 4 5)
 	true $(SUMMARIZE_CMD) #State that this has passed.  Override the default rule.

src/tests/loader-stress-test.c

@@ -385,11 +385,11 @@ static void test_loader(DB **dbs)
     gettimeofday(&start, 0);
 
     // close the loader
-    printf("%9.6fs closing\n", elapsed_time());
+    if ( verbose ) printf("%9.6fs closing\n", elapsed_time());
     if (footprint_print) printf("%s:%d Hiwater=%ld water=%ld\n", __FILE__, __LINE__, hiwater, water);
     r = loader->close(loader);
     if (footprint_print) printf("%s:%d Hiwater=%ld water=%ld (extra hiwater=%ldM)\n", __FILE__, __LINE__, hiwater, water, (hiwater-hiwater_start)/(1024*1024));
-    printf("%9.6fs done\n",    elapsed_time());
+    if ( verbose ) printf("%9.6fs done\n",    elapsed_time());
     CKERR2s(r,0,TOKUDB_CANCELED);
 
     if (r==0) {
@@ -602,7 +602,7 @@ static void do_args(int argc, char * const argv[]) {
         } else if (strcmp(argv[0], "-y")==0) {
             ALLOW_DUPS = 1;
         } else if (strcmp(argv[0], "-s")==0) {
-	    printf("\nTesting loader with size_factor=1\n");
+	    //printf("\nTesting loader with size_factor=1\n");
 	    db_env_set_loader_size_factor(1);            
 	} else if (strcmp(argv[0], "-b")==0) {
 	    argc--; argv++;