Revision c2dab091
| share/test/do_tests.sh | ||
|---|---|---|
| 62 | 62 |
|
| 63 | 63 |
if [ "$MYSQL" = "yes" ] ; then |
| 64 | 64 |
TEST_ARGS="-m" |
| 65 |
BUILD_ARGS="mysql=yes sqlite=no" |
|
| 65 | 66 |
else |
| 66 | 67 |
TEST_ARGS="-s" |
| 68 |
BUILD_ARGS="mysql=no sqlite=yes" |
|
| 67 | 69 |
fi |
| 68 | 70 |
|
| 69 | 71 |
if [ "$LOGS" = "yes" ] ; then |
| ... | ... | |
| 88 | 90 |
|
| 89 | 91 |
if [ "$CLEAR" = "yes" ] ; then |
| 90 | 92 |
scons -c |
| 91 |
rm -f callgrind.out* test.db* test.log* memgrid.out*
|
|
| 93 |
rm -f callgrind.out* test.db* *.log* memgrid.out*
|
|
| 92 | 94 |
elif [ "$BUILD" = "yes" ] ; then |
| 93 |
scons |
|
| 95 |
scons $BUILD_ARGS
|
|
| 94 | 96 |
else |
| 95 | 97 |
for j in `ls test*` ; do |
| 96 | 98 |
$CALLER ./$j $TEST_ARGS |
| src/image/test/ImagePoolTest.cc | ||
|---|---|---|
| 864 | 864 |
CPPUNIT_ASSERT( img != 0 ); |
| 865 | 865 |
//cout << endl << i << " : exp. " << results[i] << " got " << img->is_public(); |
| 866 | 866 |
|
| 867 |
// ============================================================================= |
|
| 868 |
// ============================================================================= |
|
| 869 |
// Branch feature 203 doesn't have is_public method, but this test is |
|
| 870 |
// still valid for master. |
|
| 871 |
// CPPUNIT_ASSERT( img->is_public() == results[i] ); |
|
| 872 |
// ============================================================================= |
|
| 873 |
// ============================================================================= |
|
| 867 |
CPPUNIT_ASSERT( img->isPublic() == results[i] ); |
|
| 874 | 868 |
|
| 875 | 869 |
i++; |
| 876 | 870 |
} |
| src/vnm/test/VirtualNetworkPoolTest.cc | ||
|---|---|---|
| 998 | 998 |
CPPUNIT_ASSERT( vn != 0 ); |
| 999 | 999 |
|
| 1000 | 1000 |
//cout << endl << i << ":expected " << results[i] << " got " << vn->is_public(); |
| 1001 |
|
|
| 1002 |
// ============================================================================= |
|
| 1003 |
// ============================================================================= |
|
| 1004 |
// Branch feature 203 doesn't have is_public method, but this test is |
|
| 1005 |
// still valid for master. |
|
| 1006 |
// CPPUNIT_ASSERT( vn->is_public() == results[i] ); |
|
| 1007 |
// ============================================================================= |
|
| 1008 |
// ============================================================================= |
|
| 1001 |
CPPUNIT_ASSERT( vn->isPublic() == results[i] ); |
|
| 1009 | 1002 |
i++; |
| 1010 | 1003 |
} |
| 1011 | 1004 |
} |
Also available in: Unified diff