Changeset 80e8582

Timestamp:

Jan 10, 2018, 1:21:51 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

721cd19f

Parents:

eb0aedb

Message:

Move constructor/destructor tests to raii subdirectory

Location:

src/tests

Files:

• .expect/ctor-autogen.txt (deleted)
• .expect/dtor-early-exit-ERR1.txt (deleted)
• .expect/dtor-early-exit-ERR2.txt (deleted)
• .expect/memberCtors-ERR1.txt (deleted)
• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (3 diffs)
• raii/.expect/ctor-autogen-ERR1.txt (moved) (moved from src/tests/.expect/ctor-autogen-ERR1.txt) (1 diff)
• raii/.expect/ctor-autogen.txt (moved) (moved from src/tests/.expect/init_once.txt)
• raii/.expect/dtor-early-exit-ERR1.txt (added)
• raii/.expect/dtor-early-exit-ERR2.txt (added)
• raii/.expect/dtor-early-exit.txt (moved) (moved from src/tests/.expect/dtor-early-exit.txt)
• raii/.expect/globals.txt (moved) (moved from src/tests/.expect/globals.txt)
• raii/.expect/init_once.txt (added)
• raii/.expect/memberCtors-ERR1.txt (added)
• raii/.expect/memberCtors.txt (moved) (moved from src/tests/.expect/memberCtors.txt)
• raii/ctor-autogen.c (moved) (moved from src/tests/ctor-autogen.c)
• raii/dtor-early-exit.c (moved) (moved from src/tests/dtor-early-exit.c)
• raii/globals.c (moved) (moved from src/tests/globals.c)
• raii/init_once.c (moved) (moved from src/tests/init_once.c)
• raii/memberCtors.c (moved) (moved from src/tests/memberCtors.c)
• raii/multiDimension.c (moved) (moved from src/tests/multiDimension.c)
• raii/multiDimension.txt (moved) (moved from src/tests/.expect/multiDimension.txt)

src/tests/Makefile.am

@@ -77 +77 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
 
-dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
-
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
@@ -110 +104 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-ctor-autogen-ERR1: ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
@@ -124 +112 @@
 alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+# Constructor/destructor tests
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+
+raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+

src/tests/Makefile.in

@@ -827 +827 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} ${<} -o ${@}
 
-dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
-
 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
@@ -860 +854 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
-ctor-autogen-ERR1: ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
-
 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
@@ -873 +861 @@
 
 alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+# Constructor/destructor tests
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR2 ${<} -o ${@}
+
+raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
+
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -DERR1 ${<} -o ${@}
 

src/tests/raii/.expect/ctor-autogen-ERR1.txt

@@ -1 @@
-ctor-autogen.c:102:1 error: No reasonable alternatives for expression Applying untyped: 
+raii/ctor-autogen.c:102:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?{}
 ...to: