diff options
| -rw-r--r-- | tests/data/test506 | 124 | ||||
| -rw-r--r-- | tests/libtest/lib506.c | 4 | 
2 files changed, 64 insertions, 64 deletions
diff --git a/tests/data/test506 b/tests/data/test506 index 878744f37..64eb6c9c9 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -82,85 +82,85 @@ CURL_LOCK_DATA_COOKIE  CURL_LOCK_DATA_DNS  *** run 1  CURLOPT_SHARE -lock:   share  <Pigs in space>: 0 -unlock: share  <Pigs in space>: 1 +lock:   share  [Pigs in space]: 0 +unlock: share  [Pigs in space]: 1  PERFORM -lock:   dns    <Pigs in space>: 2 -unlock: dns    <Pigs in space>: 3 -lock:   dns    <Pigs in space>: 4 -unlock: dns    <Pigs in space>: 5 -lock:   cookie <Pigs in space>: 6 -unlock: cookie <Pigs in space>: 7 -lock:   cookie <Pigs in space>: 8 -unlock: cookie <Pigs in space>: 9 -lock:   cookie <Pigs in space>: 10 -unlock: cookie <Pigs in space>: 11 -lock:   cookie <Pigs in space>: 12 -unlock: cookie <Pigs in space>: 13 +lock:   dns    [Pigs in space]: 2 +unlock: dns    [Pigs in space]: 3 +lock:   dns    [Pigs in space]: 4 +unlock: dns    [Pigs in space]: 5 +lock:   cookie [Pigs in space]: 6 +unlock: cookie [Pigs in space]: 7 +lock:   cookie [Pigs in space]: 8 +unlock: cookie [Pigs in space]: 9 +lock:   cookie [Pigs in space]: 10 +unlock: cookie [Pigs in space]: 11 +lock:   cookie [Pigs in space]: 12 +unlock: cookie [Pigs in space]: 13  run 1: set cookie 1, 2 and 3 -lock:   dns    <Pigs in space>: 14 -unlock: dns    <Pigs in space>: 15 +lock:   dns    [Pigs in space]: 14 +unlock: dns    [Pigs in space]: 15  CLEANUP -lock:   dns    <Pigs in space>: 16 -unlock: dns    <Pigs in space>: 17 -lock:   cookie <Pigs in space>: 18 -unlock: cookie <Pigs in space>: 19 -lock:   share  <Pigs in space>: 20 -unlock: share  <Pigs in space>: 21 +lock:   dns    [Pigs in space]: 16 +unlock: dns    [Pigs in space]: 17 +lock:   cookie [Pigs in space]: 18 +unlock: cookie [Pigs in space]: 19 +lock:   share  [Pigs in space]: 20 +unlock: share  [Pigs in space]: 21  *** run 2  CURLOPT_SHARE -lock:   share  <Pigs in space>: 22 -unlock: share  <Pigs in space>: 23 +lock:   share  [Pigs in space]: 22 +unlock: share  [Pigs in space]: 23  PERFORM -lock:   dns    <Pigs in space>: 24 -unlock: dns    <Pigs in space>: 25 -lock:   cookie <Pigs in space>: 26 -unlock: cookie <Pigs in space>: 27 -lock:   cookie <Pigs in space>: 28 -unlock: cookie <Pigs in space>: 29 -lock:   cookie <Pigs in space>: 30 -unlock: cookie <Pigs in space>: 31 +lock:   dns    [Pigs in space]: 24 +unlock: dns    [Pigs in space]: 25 +lock:   cookie [Pigs in space]: 26 +unlock: cookie [Pigs in space]: 27 +lock:   cookie [Pigs in space]: 28 +unlock: cookie [Pigs in space]: 29 +lock:   cookie [Pigs in space]: 30 +unlock: cookie [Pigs in space]: 31  run 2: set cookie 4 and 5 -lock:   dns    <Pigs in space>: 32 -unlock: dns    <Pigs in space>: 33 +lock:   dns    [Pigs in space]: 32 +unlock: dns    [Pigs in space]: 33  CLEANUP -lock:   dns    <Pigs in space>: 34 -unlock: dns    <Pigs in space>: 35 -lock:   cookie <Pigs in space>: 36 -unlock: cookie <Pigs in space>: 37 -lock:   share  <Pigs in space>: 38 -unlock: share  <Pigs in space>: 39 +lock:   dns    [Pigs in space]: 34 +unlock: dns    [Pigs in space]: 35 +lock:   cookie [Pigs in space]: 36 +unlock: cookie [Pigs in space]: 37 +lock:   share  [Pigs in space]: 38 +unlock: share  [Pigs in space]: 39  *** run 3  CURLOPT_SHARE -lock:   share  <Pigs in space>: 40 -unlock: share  <Pigs in space>: 41 +lock:   share  [Pigs in space]: 40 +unlock: share  [Pigs in space]: 41  CURLOPT_COOKIEJAR  PERFORM -lock:   dns    <Pigs in space>: 42 -unlock: dns    <Pigs in space>: 43 -lock:   cookie <Pigs in space>: 44 -unlock: cookie <Pigs in space>: 45 -lock:   cookie <Pigs in space>: 46 -unlock: cookie <Pigs in space>: 47 -lock:   cookie <Pigs in space>: 48 -unlock: cookie <Pigs in space>: 49 +lock:   dns    [Pigs in space]: 42 +unlock: dns    [Pigs in space]: 43 +lock:   cookie [Pigs in space]: 44 +unlock: cookie [Pigs in space]: 45 +lock:   cookie [Pigs in space]: 46 +unlock: cookie [Pigs in space]: 47 +lock:   cookie [Pigs in space]: 48 +unlock: cookie [Pigs in space]: 49  run 3: overwrite cookie 1 and 4 -lock:   dns    <Pigs in space>: 50 -unlock: dns    <Pigs in space>: 51 +lock:   dns    [Pigs in space]: 50 +unlock: dns    [Pigs in space]: 51  try SHARE_CLEANUP... -lock:   share  <Pigs in space>: 52 -unlock: share  <Pigs in space>: 53 +lock:   share  [Pigs in space]: 52 +unlock: share  [Pigs in space]: 53  SHARE_CLEANUP failed, correct  CLEANUP -lock:   dns    <Pigs in space>: 54 -unlock: dns    <Pigs in space>: 55 -lock:   cookie <Pigs in space>: 56 -unlock: cookie <Pigs in space>: 57 -lock:   share  <Pigs in space>: 58 -unlock: share  <Pigs in space>: 59 +lock:   dns    [Pigs in space]: 54 +unlock: dns    [Pigs in space]: 55 +lock:   cookie [Pigs in space]: 56 +unlock: cookie [Pigs in space]: 57 +lock:   share  [Pigs in space]: 58 +unlock: share  [Pigs in space]: 59  SHARE_CLEANUP -lock:   share  <Pigs in space>: 60 -unlock: share  <Pigs in space>: 61 +lock:   share  [Pigs in space]: 60 +unlock: share  [Pigs in space]: 61  GLOBAL_CLEANUP  </stdout>  <stderr> diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 0fc59591a..952aa997a 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -54,7 +54,7 @@ static void my_lock(CURL *handle, curl_lock_data data, curl_lock_access laccess,        fprintf(stderr, "lock: no such data: %d\n", (int)data);        return;    } -  printf("lock:   %-6s <%s>: %d\n", what, user->text, user->counter); +  printf("lock:   %-6s [%s]: %d\n", what, user->text, user->counter);    user->counter++;  } @@ -78,7 +78,7 @@ static void my_unlock(CURL *handle, curl_lock_data data, void *useptr )        fprintf(stderr, "unlock: no such data: %d\n", (int)data);        return;    } -  printf("unlock: %-6s <%s>: %d\n", what, user->text, user->counter); +  printf("unlock: %-6s [%s]: %d\n", what, user->text, user->counter);    user->counter++;  }  | 
