Changeset df29f24 in mainline for uspace/app/tester/tester.h

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

• uspace/app/tester/tester.h (modified) (3 diffs)

uspace/app/tester/tester.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <bool.h>
+#include <stacktrace.h>
 
 #define IPC_TEST_SERVICE  10240
@@ -46 +47 @@
 extern char **test_argv;
 
+/**
+ * sizeof_array
+ * @array array to determine the size of
+ *
+ * Returns the size of @array in array elements.
+ */
+#define sizeof_array(array) \
+        (sizeof(array) / sizeof((array)[0]))
+
 #define TPRINTF(format, ...) \
-        { \
+        do { \
                 if (!test_quiet) { \
-                        fprintf(stderr, format, ##__VA_ARGS__); \
+                        fprintf(stderr, (format), ##__VA_ARGS__); \
                 } \
-        }
+        } while (0)
+
+#define TSTACKTRACE() \
+        do { \
+                if (!test_quiet) { \
+                        stacktrace_print(); \
+                } \
+        } while (0)
 
 typedef const char *(*test_entry_t)(void);
@@ -79 +96 @@
 extern const char *test_malloc1(void);
 extern const char *test_malloc2(void);
+extern const char *test_malloc3(void);
 extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);
 extern const char *test_devman1(void);
+extern const char *test_devman2(void);
 
 extern test_t tests[];