Changeset 92538ab for tests/concurrent/barrier

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

Location:

tests/concurrent/barrier

Files:

• .expect/generation.txt (added)
• .expect/last.txt (moved) (moved from tests/array-container/.expect/array-md-sbscr-cases.x86.txt )
• .expect/order.txt (added)
• gen_generation_expect.cfa (added)
• generation.cfa (added)
• last.cfa (added)
• order.cfa (added)