Commit f1642131d79a4854164c47ca8abb4821aa74682c
2014-02-10T03:30:50
test: more updates and fixes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178
diff --git a/test.c b/test.c
index 546a05b..8977fbc 100644
--- a/test.c
+++ b/test.c
@@ -23,10 +23,19 @@
/* If these dlclose's fails, we don't care as the handles are going to be
closed eventually when the program ends. */
-#define CLOSE_LIB dlclose( library );
-#define CLOSE_GLOBAL dlclose( global );
-
-#define RETURN_ERROR return 1;
+#define CLOSE_LIB dlclose( library )
+#define CLOSE_GLOBAL dlclose( global )
+
+#define RETURN_ERROR return 1
+#define RUNFUNC do { \
+ ret = function (); \
+ if( ret != 0) { \
+ CLOSE_LIB; \
+ CLOSE_GLOBAL; \
+ RETURN_ERROR; \
+ } \
+ } while( 0 )
+
/* This is what this test does:
* - Open library with RTLD_GLOBAL
@@ -45,6 +54,8 @@
* - Get symbol from library through global object <- works
* - Close library
* - Close global object
+ *
+ * If one test fails, the program terminates itself.
*/
int main()
@@ -60,6 +71,7 @@ int main()
{
error = dlerror( );
printf( "ERROR\tCould not open library globally: %s\n", error ? error : "" );
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tOpened library globally: %p\n", library );
@@ -69,8 +81,8 @@ int main()
{
error = dlerror( );
printf( "ERROR\tCould not open global handle: %s\n", error ? error : "" );
- CLOSE_LIB
- RETURN_ERROR
+ CLOSE_LIB;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tGot global handle: %p\n", global );
@@ -81,15 +93,14 @@ int main()
error = dlerror( );
printf( "ERROR\tCould not get symbol from library handle: %s\n",
error ? error : "" );
- CLOSE_LIB
- CLOSE_GLOBAL
- RETURN_ERROR
+ CLOSE_LIB;
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tGot symbol from library handle: %p\n", function );
- if( function )
- function( );
+ RUNFUNC;
function = dlsym( global, "function" );
if( !function )
@@ -97,22 +108,21 @@ int main()
error = dlerror( );
printf( "ERROR\tCould not get symbol from global handle: %s\n",
error ? error : "" );
- CLOSE_LIB
- CLOSE_GLOBAL
- RETURN_ERROR
+ CLOSE_LIB;
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tGot symbol from global handle: %p\n", function );
- if( function )
- function( );
+ RUNFUNC;
ret = dlclose( library );
if( ret )
{
error = dlerror( );
printf( "ERROR\tCould not close library: %s\n", error ? error : "" );
- RETURN_ERROR
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tClosed library.\n" );
@@ -122,9 +132,9 @@ int main()
{
error = dlerror( );
printf( "ERROR\tCould not open library locally: %s\n", error ? error : "" );
- CLOSE_LIB
- CLOSE_GLOBAL
- RETURN_ERROR
+ CLOSE_LIB;
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tOpened library locally: %p\n", library );
@@ -135,39 +145,35 @@ int main()
error = dlerror( );
printf( "ERROR\tCould not get symbol from library handle: %s\n",
error ? error : "" );
- CLOSE_LIB
- CLOSE_GLOBAL
- RETURN_ERROR
+ CLOSE_LIB;
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tGot symbol from library handle: %p\n", function );
- if( function )
- function( );
+ RUNFUNC;
function = dlsym( global, "function" );
if( function )
{
error = dlerror( );
- printf( "ERROR\tGot local symbol from global handle: %s\n",
- error ? error : "" );
- CLOSE_LIB
- CLOSE_GLOBAL
- RETURN_ERROR
+ printf( "ERROR\tGot local symbol from global handle: %s @ %p\n",
+ error ? error : "", function );
+ CLOSE_LIB;
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
- printf( "SUCCESS\tDid not get local symbol from global handle: %p\n", function );
-
- if( function )
- function( );
+ printf( "SUCCESS\tDid not get local symbol from global handle.\n" );
ret = dlclose( library );
if( ret )
{
error = dlerror( );
printf( "ERROR\tCould not close library: %s\n", error ? error : "" );
- CLOSE_GLOBAL
- RETURN_ERROR
+ CLOSE_GLOBAL;
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tClosed library.\n" );
@@ -177,7 +183,7 @@ int main()
{
error = dlerror( );
printf( "ERROR\tCould not close global handle: %s\n", error ? error : "" );
- RETURN_ERROR
+ RETURN_ERROR;
}
else
printf( "SUCCESS\tClosed global handle.\n" );