1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233
|
From: Stephane Glondu <steph@glondu.net>
Date: Fri, 8 Nov 2013 22:27:23 +0100
Subject: Tune resource usage of some tests
The original tests trigger some limits and fail on kfreebsd-i386 with
uncaught exception Sys_error("Thread.create: Resource temporarily
unavailable").
---
testsuite/tests/lib-threads/sieve.ml | 2 +-
testsuite/tests/lib-threads/sieve.reference | 80 -------------------------
testsuite/tests/lib-threads/testsieve.ml | 2 +-
testsuite/tests/lib-threads/testsieve.reference | 70 ----------------------
testsuite/tests/lib-threads/token1.ml | 2 +-
testsuite/tests/lib-threads/token2.ml | 2 +-
6 files changed, 4 insertions(+), 154 deletions(-)
diff --git a/testsuite/tests/lib-threads/sieve.ml b/testsuite/tests/lib-threads/sieve.ml
index ac3a9d2..86f0e5e 100644
--- a/testsuite/tests/lib-threads/sieve.ml
+++ b/testsuite/tests/lib-threads/sieve.ml
@@ -40,6 +40,6 @@ let go max =
in Thread.create (integers 2) ch;
print_primes ch max;;
-let _ = go 500
+let _ = go 50
;;
diff --git a/testsuite/tests/lib-threads/sieve.reference b/testsuite/tests/lib-threads/sieve.reference
index 3e7998d..6beaeaa 100644
--- a/testsuite/tests/lib-threads/sieve.reference
+++ b/testsuite/tests/lib-threads/sieve.reference
@@ -13,83 +13,3 @@
41
43
47
-53
-59
-61
-67
-71
-73
-79
-83
-89
-97
-101
-103
-107
-109
-113
-127
-131
-137
-139
-149
-151
-157
-163
-167
-173
-179
-181
-191
-193
-197
-199
-211
-223
-227
-229
-233
-239
-241
-251
-257
-263
-269
-271
-277
-281
-283
-293
-307
-311
-313
-317
-331
-337
-347
-349
-353
-359
-367
-373
-379
-383
-389
-397
-401
-409
-419
-421
-431
-433
-439
-443
-449
-457
-461
-463
-467
-479
-487
-491
-499
diff --git a/testsuite/tests/lib-threads/testsieve.ml b/testsuite/tests/lib-threads/testsieve.ml
index 6979f80..2f11272 100644
--- a/testsuite/tests/lib-threads/testsieve.ml
+++ b/testsuite/tests/lib-threads/testsieve.ml
@@ -41,7 +41,7 @@ let premiers = Event.new_channel ()
let main _ =
Thread.create sieve premiers;
while true do
- for i = 1 to 100 do
+ for i = 1 to 30 do
let n = Event.sync (Event.receive premiers) in
print_int n; print_newline()
done;
diff --git a/testsuite/tests/lib-threads/testsieve.reference b/testsuite/tests/lib-threads/testsieve.reference
index b6b8c06..6e97d2c 100644
--- a/testsuite/tests/lib-threads/testsieve.reference
+++ b/testsuite/tests/lib-threads/testsieve.reference
@@ -28,73 +28,3 @@
101
103
107
-109
-113
-127
-131
-137
-139
-149
-151
-157
-163
-167
-173
-179
-181
-191
-193
-197
-199
-211
-223
-227
-229
-233
-239
-241
-251
-257
-263
-269
-271
-277
-281
-283
-293
-307
-311
-313
-317
-331
-337
-347
-349
-353
-359
-367
-373
-379
-383
-389
-397
-401
-409
-419
-421
-431
-433
-439
-443
-449
-457
-461
-463
-467
-479
-487
-491
-499
-503
-509
-521
diff --git a/testsuite/tests/lib-threads/token1.ml b/testsuite/tests/lib-threads/token1.ml
index d0a7528..692efba 100644
--- a/testsuite/tests/lib-threads/token1.ml
+++ b/testsuite/tests/lib-threads/token1.ml
@@ -37,7 +37,7 @@ let process (n, conds, nprocs) =
done
let main() =
- let nprocs = try int_of_string Sys.argv.(1) with _ -> 100 in
+ let nprocs = try int_of_string Sys.argv.(1) with _ -> 30 in
let iter = try int_of_string Sys.argv.(2) with _ -> 1000 in
let conds = Array.make nprocs (Condition.create()) in
for i = 1 to nprocs - 1 do conds.(i) <- Condition.create() done;
diff --git a/testsuite/tests/lib-threads/token2.ml b/testsuite/tests/lib-threads/token2.ml
index c3548fb..177b32a 100644
--- a/testsuite/tests/lib-threads/token2.ml
+++ b/testsuite/tests/lib-threads/token2.ml
@@ -33,7 +33,7 @@ let process (n, ins, outs, nprocs) =
done
let main() =
- let nprocs = try int_of_string Sys.argv.(1) with _ -> 100 in
+ let nprocs = try int_of_string Sys.argv.(1) with _ -> 30 in
let iter = try int_of_string Sys.argv.(2) with _ -> 1000 in
let ins = Array.make nprocs Unix.stdin in
let outs = Array.make nprocs Unix.stdout in
|