Changeset 843ca9f

Timestamp:

Sep 4, 2020, 11:36:58 AM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

03b87140, 2801829

Parents:

a3ade94 (diff), ebb7b66 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• concurrent/examples/boundedBufferEXT.cfa (modified) (2 diffs)
• test.py (modified) (1 diff)

tests/concurrent/examples/boundedBufferEXT.cfa

@@ -1 +1 @@
 //
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
-// 
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
@@ -87 +87 @@
 }
 
+enum { Prods = 4, Cons = 5 };
+Producer * prods[Prods];
+Consumer * cons[Cons];
+
 int main() {
         Buffer(int) buffer;
-        enum { Prods = 4, Cons = 5 };
-        Producer * prods[Prods];
-        Consumer * cons[Cons];
         int sums[Cons];
         int i;

tests/test.py

@@ -116 +116 @@
         parser.add_argument('--arch', help='Test for specific architecture', type=comma_separated(str), default=None)
         parser.add_argument('--continue', help='When multiple specifications are passed (debug/install/arch), sets whether or not to continue if the last specification failed', type=yes_no, default='yes', dest='continue_')
-        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
+        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=120)
         parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
         parser.add_argument('--timeout-with-gdb', help='Instead of killing the command when it times out, orphan it and print process id to allow gdb to attach', type=yes_no, default="no")