Changeset a01faa98 for tests/concurrency

Timestamp:

May 26, 2023, 11:55:33 AM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ast-experimental, master

Children:

6c121eed

Parents:

b09ca2b (diff), 53f6a11 (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/concurrency

Files:

• .expect/clib.txt (moved) (moved from tests/concurrent/.expect/clib.txt )
• .expect/clib_tls.txt (moved) (moved from tests/concurrent/.expect/clib_tls.txt )
• .expect/cluster.txt (moved) (moved from tests/concurrent/.expect/cluster.txt )
• .expect/coroutineYield.txt (moved) (moved from tests/concurrent/.expect/coroutineYield.txt )
• .expect/ctor-check.txt (moved) (moved from tests/concurrent/.expect/ctor-check.txt ) (1 diff)
• .expect/join.txt (moved) (moved from tests/concurrent/.expect/join.txt )
• .expect/joinerror.sed (moved) (moved from tests/concurrent/.expect/joinerror.sed )
• .expect/keywordErrors.txt (added)
• .expect/lockfree_stack.txt (moved) (moved from tests/concurrent/.expect/migrate.txt )
• .expect/mainError.txt (added)
• .expect/migrate.txt (moved) (moved from tests/concurrent/barrier/.expect/last.txt )
• .expect/monitor.txt (moved) (moved from tests/concurrent/.expect/monitor.txt )
• .expect/multi-monitor.txt (moved) (moved from tests/concurrent/.expect/multi-monitor.txt )
• .expect/once.txt (moved) (moved from tests/concurrent/.expect/once.txt )
• .expect/preempt.txt (moved) (moved from tests/concurrent/.expect/preempt.txt )
• .expect/preempt2.txt (moved) (moved from tests/concurrent/.expect/preempt2.txt )
• .expect/sleep.txt (moved) (moved from tests/concurrent/.expect/sleep.txt )
• .expect/suspend_then.txt (moved) (moved from tests/concurrent/.expect/suspend_then.txt )
• .expect/thread.txt (moved) (moved from tests/concurrent/.expect/thread.txt )
• actors/.expect/dynamic.txt (moved) (moved from tests/concurrent/actors/.expect/dynamic.txt )
• actors/.expect/executor.txt (moved) (moved from tests/concurrent/actors/.expect/executor.txt )
• actors/.expect/inherit.txt (moved) (moved from tests/concurrent/actors/.expect/inherit.txt )
• actors/.expect/matrix.txt (moved) (moved from tests/concurrent/actors/.expect/matrix.txt )
• actors/.expect/pingpong.txt (moved) (moved from tests/concurrent/actors/.expect/pingpong.txt )
• actors/.expect/poison.txt (moved) (moved from tests/concurrent/actors/.expect/poison.txt )
• actors/.expect/static.txt (moved) (moved from tests/concurrent/actors/.expect/static.txt )
• actors/.expect/types.txt (moved) (moved from tests/concurrent/actors/.expect/types.txt )
• actors/dynamic.cfa (moved) (moved from tests/concurrent/actors/dynamic.cfa )
• actors/executor.cfa (moved) (moved from tests/concurrent/actors/executor.cfa )
• actors/inherit.cfa (moved) (moved from tests/concurrent/actors/inherit.cfa )
• actors/matrix.cfa (moved) (moved from tests/concurrent/actors/matrix.cfa )
• actors/pingpong.cfa (moved) (moved from tests/concurrent/actors/pingpong.cfa )
• actors/poison.cfa (moved) (moved from tests/concurrent/actors/poison.cfa )
• actors/static.cfa (moved) (moved from tests/concurrent/actors/static.cfa )
• actors/types.cfa (moved) (moved from tests/concurrent/actors/types.cfa )
• barrier/.expect/generation.txt (moved) (moved from tests/concurrent/barrier/.expect/generation.txt )
• barrier/.expect/last.txt (moved) (moved from tests/concurrent/barrier/.expect/order.txt )
• barrier/.expect/order.txt (moved) (moved from tests/concurrent/examples/.expect/datingService.txt )
• barrier/gen_generation_expect.cfa (moved) (moved from tests/concurrent/barrier/gen_generation_expect.cfa )
• barrier/generation.cfa (moved) (moved from tests/concurrent/barrier/generation.cfa )
• barrier/last.cfa (moved) (moved from tests/concurrent/barrier/last.cfa )
• barrier/order.cfa (moved) (moved from tests/concurrent/barrier/order.cfa )
• channels/.expect/big_elems.txt (moved) (moved from tests/concurrent/channels/.expect/big_elems.txt )
• channels/.expect/churn.txt (moved) (moved from tests/concurrent/channels/.expect/churn.txt )
• channels/.expect/contend.txt (moved) (moved from tests/concurrent/channels/.expect/contend.txt )
• channels/.expect/daisy_chain.txt (moved) (moved from tests/concurrent/channels/.expect/daisy_chain.txt )
• channels/.expect/hot_potato.txt (moved) (moved from tests/concurrent/channels/.expect/hot_potato.txt )
• channels/.expect/ping_pong.txt (moved) (moved from tests/concurrent/channels/.expect/ping_pong.txt )
• channels/.expect/pub_sub.txt (moved) (moved from tests/concurrent/channels/.expect/pub_sub.txt )
• channels/.expect/zero_size.txt (moved) (moved from tests/concurrent/channels/.expect/zero_size.txt )
• channels/barrier.cfa (moved) (moved from tests/concurrent/channels/barrier.cfa )
• channels/big_elems.cfa (moved) (moved from tests/concurrent/channels/big_elems.cfa )
• channels/churn.cfa (moved) (moved from tests/concurrent/channels/churn.cfa )
• channels/contend.cfa (moved) (moved from tests/concurrent/channels/contend.cfa )
• channels/daisy_chain.cfa (moved) (moved from tests/concurrent/channels/daisy_chain.cfa )
• channels/hot_potato.cfa (moved) (moved from tests/concurrent/channels/hot_potato.cfa )
• channels/parallel_harness.hfa (moved) (moved from tests/concurrent/channels/parallel_harness.hfa )
• channels/ping_pong.cfa (moved) (moved from tests/concurrent/channels/ping_pong.cfa )
• channels/pub_sub.cfa (moved) (moved from tests/concurrent/channels/pub_sub.cfa )
• channels/zero_size.cfa (moved) (moved from tests/concurrent/channels/zero_size.cfa )
• clib.c (moved) (moved from tests/concurrent/clib.c )
• clib_tls.c (moved) (moved from tests/concurrent/clib_tls.c )
• cluster.cfa (moved) (moved from tests/concurrent/cluster.cfa )
• coroutineYield.cfa (moved) (moved from tests/concurrent/coroutineYield.cfa )
• ctor-check.cfa (moved) (moved from tests/concurrent/ctor-check.cfa )
• examples/.expect/boundedBufferEXT.txt (moved) (moved from tests/concurrent/examples/.expect/boundedBufferEXT.txt )
• examples/.expect/boundedBufferINT.txt (moved) (moved from tests/concurrent/examples/.expect/boundedBufferINT.txt )
• examples/.expect/datingService.txt (moved) (moved from tests/concurrent/park/.expect/force_preempt.txt )
• examples/.expect/gortn.txt (moved) (moved from tests/concurrent/examples/.expect/gortn.txt )
• examples/.expect/matrixSum.txt (moved) (moved from tests/concurrent/examples/.expect/matrixSum.txt )
• examples/.expect/quickSort.txt (moved) (moved from tests/concurrent/examples/.expect/quickSort.txt )
• examples/.in/quickSort.txt (moved) (moved from tests/concurrent/examples/.in/quickSort.txt )
• examples/boundedBufferEXT.cfa (moved) (moved from tests/concurrent/examples/boundedBufferEXT.cfa )
• examples/boundedBufferINT.cfa (moved) (moved from tests/concurrent/examples/boundedBufferINT.cfa )
• examples/boundedBufferTHREAD.cfa (moved) (moved from tests/concurrent/examples/boundedBufferTHREAD.cfa )
• examples/datingService.cfa (moved) (moved from tests/concurrent/examples/datingService.cfa )
• examples/gortn.cfa (moved) (moved from tests/concurrent/examples/gortn.cfa )
• examples/matrixSum.cfa (moved) (moved from tests/concurrent/examples/matrixSum.cfa )
• examples/multiSort.cfa (moved) (moved from tests/concurrent/examples/multiSort.cfa )
• examples/quickSort.cfa (moved) (moved from tests/concurrent/examples/quickSort.cfa )
• examples/quickSort.generic.cfa (moved) (moved from tests/concurrent/examples/quickSort.generic.cfa )
• futures/.expect/abandon.txt (moved) (moved from tests/concurrent/futures/.expect/abandon.txt )
• futures/.expect/basic.txt (moved) (moved from tests/concurrent/futures/.expect/basic.txt )
• futures/.expect/multi.txt (moved) (moved from tests/concurrent/futures/.expect/multi.txt )
• futures/.expect/select_future.txt (moved) (moved from tests/concurrent/futures/.expect/select_future.txt )
• futures/.expect/typed.txt (moved) (moved from tests/concurrent/futures/.expect/typed.txt )
• futures/.expect/wait_any.txt (moved) (moved from tests/concurrent/futures/.expect/wait_any.txt )
• futures/abandon.cfa (moved) (moved from tests/concurrent/futures/abandon.cfa )
• futures/basic.cfa (moved) (moved from tests/concurrent/futures/basic.cfa )
• futures/multi.cfa (moved) (moved from tests/concurrent/futures/multi.cfa )
• futures/select_future.cfa (moved) (moved from tests/concurrent/futures/select_future.cfa )
• futures/typed.cfa (moved) (moved from tests/concurrent/futures/typed.cfa )
• futures/wait_any.cfa (moved) (moved from tests/concurrent/futures/wait_any.cfa )
• join.cfa (moved) (moved from tests/concurrent/join.cfa )
• joinerror.cfa (moved) (moved from tests/concurrent/joinerror.cfa )
• keywordErrors.cfa (moved) (moved from tests/concurrent/keywordErrors.cfa )
• lockfree_stack.cfa (added)
• mainError.cfa (moved) (moved from tests/concurrent/mainError.cfa )
• migrate.cfa (moved) (moved from tests/concurrent/migrate.cfa )
• monitor.cfa (moved) (moved from tests/concurrent/monitor.cfa )
• multi-monitor.cfa (moved) (moved from tests/concurrent/multi-monitor.cfa )
• mutexstmt/.expect/locks.txt (moved) (moved from tests/concurrent/mutexstmt/.expect/locks.txt )
• mutexstmt/.expect/monitors.txt (moved) (moved from tests/concurrent/mutexstmt/.expect/monitors.txt )
• mutexstmt/locks.cfa (moved) (moved from tests/concurrent/mutexstmt/locks.cfa )
• mutexstmt/monitors.cfa (moved) (moved from tests/concurrent/mutexstmt/monitors.cfa )
• once.cfa (moved) (moved from tests/concurrent/once.cfa )
• park/.expect/contention.txt (moved) (moved from tests/concurrent/park/.expect/contention.txt )
• park/.expect/force_preempt.txt (moved) (moved from tests/concurrent/park/.expect/start_parked.txt )
• park/.expect/start_parked.txt (added)
• park/contention.cfa (moved) (moved from tests/concurrent/park/contention.cfa )
• park/force_preempt.cfa (moved) (moved from tests/concurrent/park/force_preempt.cfa )
• park/start_parked.cfa (moved) (moved from tests/concurrent/park/start_parked.cfa )
• preempt.cfa (moved) (moved from tests/concurrent/preempt.cfa )
• preempt2.cfa (moved) (moved from tests/concurrent/preempt2.cfa )
• pthread/.expect/bounded_buffer.x64.txt (moved) (moved from tests/concurrent/pthread/.expect/bounded_buffer.x64.txt )
• pthread/.expect/bounded_buffer.x86.txt (moved) (moved from tests/concurrent/pthread/.expect/bounded_buffer.x86.txt )
• pthread/.expect/pthread_attr_test.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_attr_test.txt )
• pthread/.expect/pthread_cond_test.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_cond_test.txt )
• pthread/.expect/pthread_demo_create_join.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_demo_create_join.txt )
• pthread/.expect/pthread_demo_lock.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_demo_lock.txt )
• pthread/.expect/pthread_key_test.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_key_test.txt )
• pthread/.expect/pthread_once_test.txt (moved) (moved from tests/concurrent/pthread/.expect/pthread_once_test.txt )
• pthread/bounded_buffer.cfa (moved) (moved from tests/concurrent/pthread/bounded_buffer.cfa )
• pthread/pthread_attr_test.cfa (moved) (moved from tests/concurrent/pthread/pthread_attr_test.cfa )
• pthread/pthread_cond_test.cfa (moved) (moved from tests/concurrent/pthread/pthread_cond_test.cfa )
• pthread/pthread_demo_create_join.cfa (moved) (moved from tests/concurrent/pthread/pthread_demo_create_join.cfa )
• pthread/pthread_demo_lock.cfa (moved) (moved from tests/concurrent/pthread/pthread_demo_lock.cfa )
• pthread/pthread_key_test.cfa (moved) (moved from tests/concurrent/pthread/pthread_key_test.cfa )
• pthread/pthread_once_test.cfa (moved) (moved from tests/concurrent/pthread/pthread_once_test.cfa )
• readyQ/.expect/barrier_sleeper.txt (moved) (moved from tests/concurrent/readyQ/.expect/barrier_sleeper.txt )
• readyQ/.expect/leader_spin.txt (moved) (moved from tests/concurrent/readyQ/.expect/leader_spin.txt )
• readyQ/barrier_sleeper.cfa (moved) (moved from tests/concurrent/readyQ/barrier_sleeper.cfa )
• readyQ/leader_spin.cfa (moved) (moved from tests/concurrent/readyQ/leader_spin.cfa )
• signal/.expect/block.txt (moved) (moved from tests/concurrent/signal/.expect/block.txt )
• signal/.expect/disjoint.txt (moved) (moved from tests/concurrent/signal/.expect/disjoint.txt )
• signal/.expect/wait.txt (moved) (moved from tests/concurrent/signal/.expect/wait.txt )
• signal/block.cfa (moved) (moved from tests/concurrent/signal/block.cfa )
• signal/disjoint.cfa (moved) (moved from tests/concurrent/signal/disjoint.cfa )
• signal/wait.cfa (moved) (moved from tests/concurrent/signal/wait.cfa )
• sleep.cfa (moved) (moved from tests/concurrent/sleep.cfa )
• suspend_then.cfa (moved) (moved from tests/concurrent/suspend_then.cfa )
• thread.cfa (moved) (moved from tests/concurrent/thread.cfa )
• unified_locking/.expect/block_spin_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/block_spin_lock.txt )
• unified_locking/.expect/exp_backoff.txt (moved) (moved from tests/concurrent/unified_locking/.expect/exp_backoff.txt )
• unified_locking/.expect/fast_block_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/fast_block_lock.txt )
• unified_locking/.expect/futex_mutex.txt (moved) (moved from tests/concurrent/unified_locking/.expect/futex_mutex.txt )
• unified_locking/.expect/locks.txt (moved) (moved from tests/concurrent/unified_locking/.expect/locks.txt )
• unified_locking/.expect/mcs.txt (moved) (moved from tests/concurrent/unified_locking/.expect/mcs.txt )
• unified_locking/.expect/mcs_block_spin_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/mcs_block_spin_lock.txt )
• unified_locking/.expect/mcs_spin.txt (moved) (moved from tests/concurrent/unified_locking/.expect/mcs_spin.txt )
• unified_locking/.expect/pthread_locks.txt (moved) (moved from tests/concurrent/unified_locking/.expect/pthread_locks.txt )
• unified_locking/.expect/simple_owner_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/simple_owner_lock.txt )
• unified_locking/.expect/spin_queue_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/spin_queue_lock.txt )
• unified_locking/.expect/timeout_lock.txt (moved) (moved from tests/concurrent/unified_locking/.expect/timeout_lock.txt )
• unified_locking/block_spin_lock.cfa (moved) (moved from tests/concurrent/unified_locking/block_spin_lock.cfa )
• unified_locking/exp_backoff.cfa (moved) (moved from tests/concurrent/unified_locking/exp_backoff.cfa )
• unified_locking/fast_block_lock.cfa (moved) (moved from tests/concurrent/unified_locking/fast_block_lock.cfa )
• unified_locking/futex_mutex.cfa (moved) (moved from tests/concurrent/unified_locking/futex_mutex.cfa )
• unified_locking/locks.cfa (moved) (moved from tests/concurrent/unified_locking/locks.cfa )
• unified_locking/mcs.cfa (moved) (moved from tests/concurrent/unified_locking/mcs.cfa )
• unified_locking/mcs_block_spin_lock.cfa (moved) (moved from tests/concurrent/unified_locking/mcs_block_spin_lock.cfa )
• unified_locking/mcs_spin.cfa (moved) (moved from tests/concurrent/unified_locking/mcs_spin.cfa )
• unified_locking/mutex_test.hfa (moved) (moved from tests/concurrent/unified_locking/mutex_test.hfa )
• unified_locking/pthread_locks.cfa (moved) (moved from tests/concurrent/unified_locking/pthread_locks.cfa )
• unified_locking/simple_owner_lock.cfa (moved) (moved from tests/concurrent/unified_locking/simple_owner_lock.cfa )
• unified_locking/spin_queue_lock.cfa (moved) (moved from tests/concurrent/unified_locking/spin_queue_lock.cfa )
• unified_locking/spintest.cfa (moved) (moved from tests/concurrent/unified_locking/spintest.cfa )
• unified_locking/test_debug.cfa (moved) (moved from tests/concurrent/unified_locking/test_debug.cfa )
• unified_locking/thread_test.cfa (moved) (moved from tests/concurrent/unified_locking/thread_test.cfa )
• unified_locking/timeout_lock.cfa (moved) (moved from tests/concurrent/unified_locking/timeout_lock.cfa )
• waitfor/.expect/barge.txt (moved) (moved from tests/concurrent/waitfor/.expect/barge.txt )
• waitfor/.expect/dtor.txt (moved) (moved from tests/concurrent/waitfor/.expect/dtor.txt )
• waitfor/.expect/else.txt (moved) (moved from tests/concurrent/waitfor/.expect/else.txt )
• waitfor/.expect/parse.txt (added)
• waitfor/.expect/recurse.txt (moved) (moved from tests/concurrent/waitfor/.expect/recurse.txt )
• waitfor/.expect/statment.txt (moved) (moved from tests/concurrent/waitfor/.expect/statment.txt )
• waitfor/.expect/when.txt (moved) (moved from tests/concurrent/waitfor/.expect/when.txt )
• waitfor/barge.cfa (moved) (moved from tests/concurrent/waitfor/barge.cfa )
• waitfor/dtor.cfa (moved) (moved from tests/concurrent/waitfor/dtor.cfa )
• waitfor/else.cfa (moved) (moved from tests/concurrent/waitfor/else.cfa )
• waitfor/parse.cfa (moved) (moved from tests/concurrent/waitfor/parse.cfa )
• waitfor/recurse.cfa (moved) (moved from tests/concurrent/waitfor/recurse.cfa )
• waitfor/simple.cfa (moved) (moved from tests/concurrent/waitfor/simple.cfa )
• waitfor/statment.cfa (moved) (moved from tests/concurrent/waitfor/statment.cfa )
• waitfor/when.cfa (moved) (moved from tests/concurrent/waitfor/when.cfa )
• waituntil/.expect/all_types.txt (moved) (moved from tests/concurrent/waituntil/.expect/all_types.txt )
• waituntil/.expect/basic_else.txt (moved) (moved from tests/concurrent/waituntil/.expect/basic_else.txt )
• waituntil/.expect/channel_close.txt (moved) (moved from tests/concurrent/waituntil/.expect/channel_close.txt )
• waituntil/.expect/channel_zero_size.txt (moved) (moved from tests/concurrent/waituntil/.expect/channel_zero_size.txt )
• waituntil/.expect/channels.txt (moved) (moved from tests/concurrent/waituntil/.expect/channels.txt )
• waituntil/.expect/futures.txt (moved) (moved from tests/concurrent/waituntil/.expect/futures.txt )
• waituntil/.expect/locks.txt (moved) (moved from tests/concurrent/waituntil/.expect/locks.txt )
• waituntil/.expect/one_chan.txt (moved) (moved from tests/concurrent/waituntil/.expect/one_chan.txt )
• waituntil/.expect/timeout.txt (moved) (moved from tests/concurrent/waituntil/.expect/timeout.txt )
• waituntil/all_types.cfa (moved) (moved from tests/concurrent/waituntil/all_types.cfa )
• waituntil/basic_else.cfa (moved) (moved from tests/concurrent/waituntil/basic_else.cfa )
• waituntil/channel_close.cfa (moved) (moved from tests/concurrent/waituntil/channel_close.cfa )
• waituntil/channel_zero_size.cfa (moved) (moved from tests/concurrent/waituntil/channel_zero_size.cfa )
• waituntil/channels.cfa (moved) (moved from tests/concurrent/waituntil/channels.cfa )
• waituntil/futures.cfa (moved) (moved from tests/concurrent/waituntil/futures.cfa )
• waituntil/locks.cfa (moved) (moved from tests/concurrent/waituntil/locks.cfa )
• waituntil/one_chan.cfa (moved) (moved from tests/concurrent/waituntil/one_chan.cfa )
• waituntil/timeout.cfa (moved) (moved from tests/concurrent/waituntil/timeout.cfa )

tests/concurrency/.expect/ctor-check.txt

@@ -1 @@
-concurrent/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters
+concurrency/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters
 ?{}: function
 ... with parameters