Changeset 6c144d8 for tests

Timestamp:

Aug 6, 2020, 3:34:47 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1eb239e4, c8e4b23d

Parents:

d3a518c (diff), 74cfe054 (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)
• Makefile.in (modified) (2 diffs)
• exceptions/.expect/polymorphic.txt (moved) (moved from tests/exceptions/.expect/polymophic.txt)
• exceptions/polymorphic.cfa (moved) (moved from tests/exceptions/polymophic.cfa) (1 diff)

tests/Makefile.am

@@ -19 +19 @@
 
 include $(top_srcdir)/src/cfa.make
+
+DEFAULT_INCLUDES = -I${abs_srcdir}
 
 debug=yes

tests/Makefile.in

@@ -133 +133 @@
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
 am__depfiles_maybe = depfiles
@@ -394 +393 @@
 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
 am__v_JAVAC_1 = 
+DEFAULT_INCLUDES = -I${abs_srcdir}
 debug = yes
 installed = no

tests/exceptions/polymorphic.cfa

@@ -3 +3 @@
 #include <exception.hfa>
 
-FORALL_TRIVIAL_EXCEPTION_(proxy, (otype U3), (U3));
-FORALL_TRIVIAL_INSTANCE_(proxy, (otype U4), (U4))
+FORALL_TRIVIAL_EXCEPTION(proxy, (otype T), (T));
+FORALL_TRIVIAL_INSTANCE(proxy, (otype U), (U))
 
 const char * msg(proxy(int) * this) { return "proxy(int)"; }