Changeset 2a301ff for tests/Makefile.am

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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

File:

• tests/Makefile.am (modified) (3 diffs)

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun May 28 08:15:43 2023
-## Update Count     : 196
+## Last Modified On : Wed Aug 30 22:31:45 2023
+## Update Count     : 197
 ###############################################################################
 
@@ -91 +91 @@
         concurrency/unified_locking/mutex_test.hfa \
         concurrency/channels/parallel_harness.hfa \
-        array-container/dimexpr-match.hfa \
-        array-container/dimexpr-match-detail.sh
+        array-collections/dimexpr-match.hfa \
+        array-collections/dimexpr-match-detail.sh
 
 dist-hook:
@@ -227 +227 @@
         -cp ${test} ${abspath ${@}}
 
-array-container/dimexpr-match-c-ERRS : array-container/dimexpr-match-c.cfa
+array-collections/dimexpr-match-c-ERRS : array-collections/dimexpr-match-c.cfa
         ${CFACOMPILE_SYNTAX} -DERRS
         -cp ${test} ${abspath ${@}}
 
-array-container/dimexpr-match-cfa-ERRS : array-container/dimexpr-match-cfa.cfa
+array-collections/dimexpr-match-cfa-ERRS : array-collections/dimexpr-match-cfa.cfa
         ${CFACOMPILE_SYNTAX} -DERRS
         -cp ${test} ${abspath ${@}}