diff options
Diffstat (limited to 'pjlib-util/src')
-rw-r--r-- | pjlib-util/src/pjlib-util-test/main.c | 35 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util-test/test.c | 68 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util-test/test.h | 10 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util-test/xml.c | 6 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/md5.c | 2 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/scanner.c | 2 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/stun.c | 2 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/stun_client.c | 2 | ||||
-rw-r--r-- | pjlib-util/src/pjlib-util/xml.c | 4 |
9 files changed, 122 insertions, 9 deletions
diff --git a/pjlib-util/src/pjlib-util-test/main.c b/pjlib-util/src/pjlib-util-test/main.c new file mode 100644 index 00000000..3a572589 --- /dev/null +++ b/pjlib-util/src/pjlib-util-test/main.c @@ -0,0 +1,35 @@ +#include "test.h"
+
+#if defined(PJ_SUNOS) && PJ_SUNOS!=0
+#include <signal.h>
+static void init_signals()
+{
+ struct sigaction act;
+
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = SIG_IGN;
+
+ sigaction(SIGALRM, &act, NULL);
+}
+
+#else
+#define init_signals()
+#endif
+
+#define boost()
+
+int main(int argc, char *argv[])
+{
+ int rc;
+
+ PJ_UNUSED_ARG(argc);
+ PJ_UNUSED_ARG(argv);
+
+ boost();
+ init_signals();
+
+ rc = test_main();
+
+ return rc;
+}
+
diff --git a/pjlib-util/src/pjlib-util-test/test.c b/pjlib-util/src/pjlib-util-test/test.c new file mode 100644 index 00000000..45027280 --- /dev/null +++ b/pjlib-util/src/pjlib-util-test/test.c @@ -0,0 +1,68 @@ +#include "test.h"
+#include <pjlib.h>
+
+void app_perror(const char *msg, pj_status_t rc)
+{
+ char errbuf[256];
+
+ PJ_CHECK_STACK();
+
+ pj_strerror(rc, errbuf, sizeof(errbuf));
+ PJ_LOG(1,("test", "%s: [pj_status_t=%d] %s", msg, rc, errbuf));
+}
+
+#define DO_TEST(test) do { \
+ PJ_LOG(3, ("test", "Running %s...", #test)); \
+ rc = test; \
+ PJ_LOG(3, ("test", \
+ "%s(%d)", \
+ (char*)(rc ? "..ERROR" : "..success"), rc)); \
+ if (rc!=0) goto on_return; \
+ } while (0)
+
+
+pj_pool_factory *mem;
+
+
+static int test_inner(void)
+{
+ pj_caching_pool caching_pool;
+ int rc = 0;
+
+ mem = &caching_pool.factory;
+
+ pj_log_set_level(3);
+ pj_log_set_decor(PJ_LOG_HAS_NEWLINE | PJ_LOG_HAS_TIME |
+ PJ_LOG_HAS_MICRO_SEC);
+
+ rc = pj_init();
+ if (rc != 0) {
+ app_perror("pj_init() error!!", rc);
+ return rc;
+ }
+
+ pj_dump_config();
+ pj_caching_pool_init( &caching_pool, &pj_pool_factory_default_policy, 0 );
+ DO_TEST(xml_test());
+
+on_return:
+ return rc;
+}
+
+int test_main(void)
+{
+ PJ_USE_EXCEPTION;
+
+ PJ_TRY {
+ return test_inner();
+ }
+ PJ_DEFAULT {
+ int id = PJ_GET_EXCEPTION();
+ PJ_LOG(3,("test", "FATAL: unhandled exception id %d (%s)",
+ id, pj_exception_id_name(id)));
+ }
+ PJ_END;
+
+ return -1;
+}
+
diff --git a/pjlib-util/src/pjlib-util-test/test.h b/pjlib-util/src/pjlib-util-test/test.h new file mode 100644 index 00000000..2545bd7f --- /dev/null +++ b/pjlib-util/src/pjlib-util-test/test.h @@ -0,0 +1,10 @@ +#include <pj/types.h>
+
+#define INCLUDE_XML_TEST 1
+
+extern int xml_test(void);
+extern int test_main(void);
+
+extern void app_perror(const char *title, pj_status_t rc);
+extern pj_pool_factory *mem;
+
diff --git a/pjlib-util/src/pjlib-util-test/xml.c b/pjlib-util/src/pjlib-util-test/xml.c index 9554ba08..d4e22746 100644 --- a/pjlib-util/src/pjlib-util-test/xml.c +++ b/pjlib-util/src/pjlib-util-test/xml.c @@ -1,11 +1,11 @@ -/* $Id$
- */
+/* $Id$ + */ #include "test.h" #if INCLUDE_XML_TEST -#include <pj/xml.h> +#include <pjlib-util/xml.h> #include <pjlib.h> #define THIS_FILE "xml_test" diff --git a/pjlib-util/src/pjlib-util/md5.c b/pjlib-util/src/pjlib-util/md5.c index 7e78c9e0..10a903da 100644 --- a/pjlib-util/src/pjlib-util/md5.c +++ b/pjlib-util/src/pjlib-util/md5.c @@ -53,7 +53,7 @@ 1999-05-03 lpd Original version. */ -#include <pj/md5.h> +#include <pjlib-util/md5.h> #include <pj/string.h> #include <pj/os.h> diff --git a/pjlib-util/src/pjlib-util/scanner.c b/pjlib-util/src/pjlib-util/scanner.c index b054f1d1..65e3f351 100644 --- a/pjlib-util/src/pjlib-util/scanner.c +++ b/pjlib-util/src/pjlib-util/scanner.c @@ -1,6 +1,6 @@ /* $Id$ */ -#include <pj/scanner.h> +#include <pjlib-util/scanner.h> #include <pj/string.h> #include <pj/except.h> #include <pj/os.h> diff --git a/pjlib-util/src/pjlib-util/stun.c b/pjlib-util/src/pjlib-util/stun.c index 90dd36a8..4b417533 100644 --- a/pjlib-util/src/pjlib-util/stun.c +++ b/pjlib-util/src/pjlib-util/stun.c @@ -1,6 +1,6 @@ /* $Id$ */ -#include <pj/stun.h> +#include <pjlib-util/stun.h> #include <pj/pool.h> #include <pj/log.h> #include <pj/sock.h> diff --git a/pjlib-util/src/pjlib-util/stun_client.c b/pjlib-util/src/pjlib-util/stun_client.c index 75d20ee6..6bfca13f 100644 --- a/pjlib-util/src/pjlib-util/stun_client.c +++ b/pjlib-util/src/pjlib-util/stun_client.c @@ -1,6 +1,6 @@ /* $Id$ */ -#include <pj/stun.h> +#include <pjlib-util/stun.h> #include <pj/pool.h> #include <pj/log.h> #include <pj/string.h> diff --git a/pjlib-util/src/pjlib-util/xml.c b/pjlib-util/src/pjlib-util/xml.c index 19fe21f5..600666d6 100644 --- a/pjlib-util/src/pjlib-util/xml.c +++ b/pjlib-util/src/pjlib-util/xml.c @@ -1,7 +1,7 @@ /* $Id$ */ -#include <pj/xml.h> -#include <pj/scanner.h> +#include <pjlib-util/xml.h> +#include <pjlib-util/scanner.h> #include <pj/except.h> #include <pj/pool.h> #include <pj/string.h> |