diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-04-08 20:49:11 +0000 |
commit | c3a6ff8c6e4a0c743cd33eb29931f837eeb2959e (patch) | |
tree | df8d8a97baebea55aaf94cc816974a86475c3a4b /test/unit/expr/node_manager_black.h | |
parent | de2b6c4ee9c2ecad88bddd0a60f10e94d6f8c71f (diff) |
A handful of build system fixes:
* (test/unit/Makefile.am) libtool was being passed relative paths of
sources in .cpp, confusing lcov if -b wasn't given. Fixed.
Closes bug #102.
* (configure.ac) --enable-coverage now implies --enable-static
--enable-static-binary --disable-shared.
* (configure.ac) Create top-level config.status for informational and
re-configuration purposes.
* (configure.ac) Remove -fvisibility=hidden for debug builds.
Closes bug #104.
* (test/unit/Makefile.am) Build unit tests with -Wall.
* (various unit tests) Fixed trivially-fixable warnings in building
unit tests. (Signedness in comparison, unused variables, etc.)
* (Makefile.builds.in) Copy the binary correctly if it is static.
(It was failing, but only with --enable-static --enable-shared
--enable-static-binary.) Closes bug #103.
* (src/parser/Makefile.am) libcvc4parser.so now links with libcvc4.so.
* Other minor cleanups to the build system.
Diffstat (limited to 'test/unit/expr/node_manager_black.h')
-rw-r--r-- | test/unit/expr/node_manager_black.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/unit/expr/node_manager_black.h b/test/unit/expr/node_manager_black.h index 3e65be0b7..e059fa509 100644 --- a/test/unit/expr/node_manager_black.h +++ b/test/unit/expr/node_manager_black.h @@ -52,7 +52,7 @@ public: void testMkNode1() { Node x = d_nodeManager->mkVar("x",d_nodeManager->booleanType()); Node n = d_nodeManager->mkNode(NOT, x); - TS_ASSERT_EQUALS( n.getNumChildren(), 1 ); + TS_ASSERT_EQUALS( n.getNumChildren(), 1u ); TS_ASSERT_EQUALS( n.getKind(), NOT); TS_ASSERT_EQUALS( n[0], x); } @@ -61,7 +61,7 @@ public: Node x = d_nodeManager->mkVar("x",d_nodeManager->booleanType()); Node y = d_nodeManager->mkVar("y",d_nodeManager->booleanType()); Node n = d_nodeManager->mkNode(IMPLIES, x, y); - TS_ASSERT_EQUALS( n.getNumChildren(), 2 ); + TS_ASSERT_EQUALS( n.getNumChildren(), 2u ); TS_ASSERT_EQUALS( n.getKind(), IMPLIES); TS_ASSERT_EQUALS( n[0], x); TS_ASSERT_EQUALS( n[1], y); @@ -72,7 +72,7 @@ public: Node y = d_nodeManager->mkVar("y",d_nodeManager->booleanType()); Node z = d_nodeManager->mkVar("z",d_nodeManager->booleanType()); Node n = d_nodeManager->mkNode(AND, x, y, z); - TS_ASSERT_EQUALS( n.getNumChildren(), 3 ); + TS_ASSERT_EQUALS( n.getNumChildren(), 3u ); TS_ASSERT_EQUALS( n.getKind(), AND); TS_ASSERT_EQUALS( n[0], x); TS_ASSERT_EQUALS( n[1], y); @@ -85,12 +85,12 @@ public: Node x3 = d_nodeManager->mkVar("x3",d_nodeManager->booleanType()); Node x4 = d_nodeManager->mkVar("x4",d_nodeManager->booleanType()); Node n = d_nodeManager->mkNode(AND, x1, x2, x3, x4); - TS_ASSERT_EQUALS( n.getNumChildren(), 4 ); - TS_ASSERT_EQUALS( n.getKind(), AND); - TS_ASSERT_EQUALS( n[0], x1); - TS_ASSERT_EQUALS( n[1], x2); - TS_ASSERT_EQUALS( n[2], x3); - TS_ASSERT_EQUALS( n[3], x4); + TS_ASSERT_EQUALS( n.getNumChildren(), 4u ); + TS_ASSERT_EQUALS( n.getKind(), AND ); + TS_ASSERT_EQUALS( n[0], x1 ); + TS_ASSERT_EQUALS( n[1], x2 ); + TS_ASSERT_EQUALS( n[2], x3 ); + TS_ASSERT_EQUALS( n[3], x4 ); } void testMkNode5() { @@ -100,7 +100,7 @@ public: Node x4 = d_nodeManager->mkVar("x4",d_nodeManager->booleanType()); Node x5 = d_nodeManager->mkVar("x5",d_nodeManager->booleanType()); Node n = d_nodeManager->mkNode(AND, x1, x2, x3, x4, x5); - TS_ASSERT_EQUALS( n.getNumChildren(), 5 ); + TS_ASSERT_EQUALS( n.getNumChildren(), 5u ); TS_ASSERT_EQUALS( n.getKind(), AND); TS_ASSERT_EQUALS( n[0], x1); TS_ASSERT_EQUALS( n[1], x2); @@ -120,7 +120,7 @@ public: Node n = d_nodeManager->mkNode(AND, args); TS_ASSERT_EQUALS( n.getNumChildren(), args.size() ); TS_ASSERT_EQUALS( n.getKind(), AND); - for( int i=0; i < args.size(); ++i ) { + for( unsigned i = 0; i < args.size(); ++i ) { TS_ASSERT_EQUALS( n[i], args[i]); } } @@ -136,7 +136,7 @@ public: Node n = d_nodeManager->mkNode(AND, args); TS_ASSERT_EQUALS( n.getNumChildren(), args.size() ); TS_ASSERT_EQUALS( n.getKind(), AND); - for( int i=0; i < args.size(); ++i ) { + for( unsigned i = 0; i < args.size(); ++i ) { TS_ASSERT_EQUALS( n[i], args[i]); } } @@ -145,7 +145,7 @@ public: Type* booleanType = d_nodeManager->booleanType(); Node x = d_nodeManager->mkVar(booleanType); TS_ASSERT_EQUALS(x.getKind(),VARIABLE); - TS_ASSERT_EQUALS(x.getNumChildren(),0); + TS_ASSERT_EQUALS(x.getNumChildren(),0u); TS_ASSERT_EQUALS(x.getType(),booleanType); } @@ -153,7 +153,7 @@ public: Type* booleanType = d_nodeManager->booleanType(); Node x = d_nodeManager->mkVar("x", booleanType); TS_ASSERT_EQUALS(x.getKind(),VARIABLE); - TS_ASSERT_EQUALS(x.getNumChildren(),0); + TS_ASSERT_EQUALS(x.getNumChildren(),0u); TS_ASSERT_EQUALS(x.getAttribute(VarNameAttr()),"x"); TS_ASSERT_EQUALS(x.getType(),booleanType); } @@ -219,7 +219,7 @@ public: TS_ASSERT( t->isFunction() ); FunctionType* ft = (FunctionType*)t; - TS_ASSERT_EQUALS(ft->getArgTypes().size(), 1); + TS_ASSERT_EQUALS(ft->getArgTypes().size(), 1u); TS_ASSERT_EQUALS(ft->getArgTypes()[0], booleanType); TS_ASSERT_EQUALS(ft->getRangeType(), booleanType); |