r23792: convert Samba4 to GPLv3

[samba.git] / source4 / torture / basic / base.c

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index a2d9944ee8449e9e926f0ecb8c0702c20ccca0d1..55e970f130f237ebe248a5dd5db33a75b35dbc98 100644 (file)
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -93,7 +92,7 @@ static BOOL tcon_devtest(struct torture_context *tctx,
                if (status) {
                        torture_fail(tctx, talloc_asprintf(tctx, 
                                   "tconx to share %s with type %s "
-                              "should have failed but succeeded\n",
+                              "should have failed but succeeded",
                               myshare, devtype));
                } else {
                        if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),
@@ -567,7 +566,9 @@ static BOOL rw_torture2(struct torture_context *tctx,
        {
                size_t buf_size = ((uint_t)random()%(sizeof(buf)-1))+ 1;
                if (i % 10 == 0) {
-                       torture_comment(tctx, "%d\r", i); fflush(stdout);
+                       if (torture_setting_bool(tctx, "progress", true)) {
+                               torture_comment(tctx, "%d\r", i); fflush(stdout);
+                       }
                }
 
                generate_random_buffer(buf, buf_size);
@@ -725,7 +726,7 @@ static BOOL run_vuidtest(struct torture_context *tctx,
                             NT_STATUS_INVALID_HANDLE)) {
                torture_fail(tctx, talloc_asprintf(tctx, 
                                "qfileinfo should have returned DOS error "
-                      "ERRSRV:ERRbaduid\n  but returned %s\n",
+                      "ERRSRV:ERRbaduid\n  but returned %s",
                       smbcli_errstr(cli->tree)));
        }
 
@@ -1539,7 +1540,7 @@ static BOOL torture_samba3_errorpaths(struct torture_context *tctx)
                if (!NT_STATUS_EQUAL(status,
                                     NT_STATUS_DOS(ERRDOS, ERRrename))) {
                        torture_comment(tctx, "(%s) incorrect status %s "
-                                       "should be ERRDOS:ERRnoaccess\n",
+                                       "should be ERRDOS:ERRrename\n",
                                        __location__, nt_errstr(status));
                        goto fail;
                }