Changeset 52fad0c for tests

Timestamp:

Aug 27, 2021, 3:52:13 PM (4 years ago)

Author:

Henry Xue <y58xue@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

1d402be

Parents:

6c2dc00 (diff), 702839bb (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:

• Makefile.am (modified) (1 diff)
• concurrent/mutexstmt/.expect/locks.txt (added)
• concurrent/mutexstmt/locks.cfa (modified) (3 diffs)
• concurrent/mutexstmt/monitors.cfa (modified) (2 diffs)

tests/Makefile.am

@@ -82 +82 @@
         concurrent/clib_tls.c \
         exceptions/with-threads.hfa \
-        exceptions/except-io.hfa \
-        unified_locking/mutex_test.hfa
+        exceptions/except-io.hfa
 
 dist-hook:

tests/concurrent/mutexstmt/locks.cfa

@@ -1 @@
-#include <mutex_stmt_locks.hfa>
+#include <mutex_stmt.hfa>
 #include <locks.hfa>
 
@@ -13 +13 @@
         for (unsigned int i = 0; i < num_times; i++) {
                 mutex ( m1 ) count++;
-                mutex ( m1 ) {
+                mutex ( m1 ) { 
                         assert(!insideFlag);
                         insideFlag = true;
@@ -65 +65 @@
         printf("Start Test: single lock mutual exclusion\n");
         {
-                T_Mutex t[10];
+                T_Mutex t[1];
         }
         printf("End Test: single lock mutual exclusion\n");

tests/concurrent/mutexstmt/monitors.cfa

@@ -1 +1 @@
 #include <monitor.hfa>
+#include <mutex_stmt.hfa>
 #include <stdio.h>
 #include <stdlib.hfa>
@@ -13 +14 @@
 bool insideFlag = false;
 int count = 0;
+bool startFlag = false;
 
 void main( T_Mutex & this ) {