Changeset 1da7397 for tests

Timestamp:

Mar 27, 2021, 6:04:14 PM (23 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

fec3e9a

Parents:

2644610 (diff), f8a7fed (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:

fix conflict

Location:

tests

Files:

• Makefile.am (modified) (1 diff)
• collections/.expect/atomic_mpsc.txt (added)
• collections/atomic_mpsc.cfa (added)
• concurrent/.expect/spinaphore.txt (added)
• concurrent/spinaphore.cfa (added)
• unified_locking/.expect/mcs.txt (added)
• unified_locking/mcs.cfa (added)

tests/Makefile.am

@@ -75 +75 @@
         pybin/tools.py \
         long_tests.hfa \
-        .in/io.data \
         io/.in/io.data \
+        io/.in/many_read.data \
         avltree/avl.h \
         avltree/avl-private.h \
         concurrent/clib.c \
+        concurrent/clib_tls.c \
         exceptions/with-threads.hfa \
         exceptions/except-io.hfa