4 files changed, 30 insertions, 14 deletions

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 2dd079c4b0..b551af00b1 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -87,8 +87,10 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	printf("waiting for completion\n");
 	while (*count != num_ops) {
 		event_loop_once(cli->transport->socket->event.ctx);
-		printf("count=%d\r", *count);
-		fflush(stdout);
+		if (lp_parm_bool(-1, "torture", "progress", true)) {
+			printf("count=%d\r", *count);
+			fflush(stdout);
+		}
 	}
 	printf("count=%d\n", *count);
 	
@@ -175,8 +177,10 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
 	while (*count != torture_numops) {
 		event_loop_once(event_ctx);
-		printf("count=%d\r", *count);
-		fflush(stdout);
+		if (lp_parm_bool(-1, "torture", "progress", true)) {
+			printf("count=%d\r", *count);
+			fflush(stdout);
+		}
 	}
 	printf("count=%d\n", *count);
 
@@ -293,8 +297,10 @@ static BOOL test_appendacl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	printf("waiting for completion\n");
 	while (*count != num_ops) {
 		event_loop_once(event_ctx);
-		printf("count=%d\r", *count);
-		fflush(stdout);
+		if (lp_parm_bool(-1, "torture", "progress", true)) {
+			printf("count=%d\r", *count);
+			fflush(stdout);
+		}
 	}
 	printf("count=%d\n", *count);
 
@@ -358,8 +364,10 @@ static BOOL test_fsinfo(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
 	while (*count < torture_numops) {
 		event_loop_once(event_ctx);
-		printf("count=%d\r", *count);
-		fflush(stdout);
+		if (lp_parm_bool(-1, "torture", "progress", true)) {
+			printf("count=%d\r", *count);
+			fflush(stdout);
+		}
 	}
 	printf("count=%d\n", *count);
 
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 4dbefd5d9b..3d02e0f5c4 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -171,8 +171,11 @@ BOOL torture_bench_lock(struct torture_context *torture)
 		for (i=0;i<nprocs;i++) {
 			total += state[i].count;
 		}
-		printf("%.2f ops/second\r", total/timeval_elapsed(&tv));
-		fflush(stdout);
+
+		if (torture_setting_bool(torture, "progress", true)) {
+			printf("%.2f ops/second\r", total/timeval_elapsed(&tv));
+			fflush(stdout);
+		}
 	}
 
 	printf("%.2f ops/second\n", total/timeval_elapsed(&tv));
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index a7f95d7c53..9867a407ec 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -209,9 +209,11 @@ BOOL torture_bench_open(struct torture_context *torture)
 
 		if (loops++ % 1000 != 0) continue;
 
-		printf("%.2f ops/second (%d retries)\r", 
-		       total/timeval_elapsed(&tv), open_retries);
-		fflush(stdout);
+		if (torture_setting_bool(torture, "progress", true)) {
+			printf("%.2f ops/second (%d retries)\r", 
+			       total/timeval_elapsed(&tv), open_retries);
+			fflush(stdout);
+		}
 	}
 
 	printf("%.2f ops/second (%d retries)\n", 
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 1e677fad45..c02b58a9de 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -827,7 +827,10 @@ BOOL torture_bench_oplock(struct torture_context *torture)
 			CHECK_STATUS(torture, status, NT_STATUS_OK);
 			count++;
 		}
-		torture_comment(torture, "%.2f ops/second\r", count/timeval_elapsed(&tv));
+
+		if (torture_setting_bool(torture, "progress", true)) {
+			torture_comment(torture, "%.2f ops/second\r", count/timeval_elapsed(&tv));
+		}
 	}
 
 	torture_comment(torture, "%.2f ops/second\n", count/timeval_elapsed(&tv));