Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/libneon/patches/002-tests-common-test.c.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 15 Mar 2017 10:30:53 -0700
branchs11u3-sru
changeset 7925 9029178fe4cd
parent 4172 a6d468ddeb77
permissions -rw-r--r--
25727003 Upgrade Samba to 4.4.13 25833834 problem in UTILITY/SAMBA 25511645 smbclient fails to list shares from Solaris 11 SPARC kernel SMB server
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4172
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
# Internal patch.
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
# We don't want \r we want \n because we're UNIX.
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
# Not for upstream.
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
--- test/common/tests.c	2013-07-31 06:50:34.000000000 -0700
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
+++ test/common/tests.c	2015-03-17 19:13:48.294707531 -0700
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
@@ -154,7 +154,7 @@
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
 static void print_prefix(int n)
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
 {
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
     if (quiet) {
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
-        printf("\r%s%.*s %2u/%2u ", test_suite,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
+        printf("\n%s%.*s %2u/%2u ", test_suite,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
                (int) (strlen(dots) - strlen(test_suite)), dots,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
                n + 1, count);
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
     }
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
@@ -163,7 +163,7 @@
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
 	    printf("    %s ", dots);
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
         }
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
         else {
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
-            printf("\r%2d. %s%.*s ", n, test_name,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
+            printf("\n%2d. %s%.*s ", n, test_name,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
                (int) (strlen(dots) - strlen(test_name)), dots);
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
         }
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
     }
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
@@ -393,7 +393,7 @@
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
             printf("<- all tests skipped for `%s'.\n", test_suite);
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
     } else {
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
         if (quiet) {
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
-            printf("\r%s%.*s %2u/%2u ", test_suite,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
+            printf("\n%s%.*s %2u/%2u ", test_suite,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
                    (int) (strlen(dots) - strlen(test_suite)), dots,
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
                    passes, count);
a6d468ddeb77 20722564 upgrade libneon to 0.30.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
             if (fails == 0) {
upstream/oracle/userland-gate