summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0f0849e)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1795
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
SimGrid (3.0.2) unstable; urgency=low
SimGrid (3.0.2) unstable; urgency=low
+ XBT:
+ * New module: testsuite [MQ]
###
### Ongoing stuff
###
###
### Ongoing stuff
###
+/* FIXME: better place? */
+int vasprintf (char **ptr, const char *fmt, va_list ap);
+char *bprintf(const char*fmt, ...) _XBT_GNUC_PRINTF(1,2);
+Replace fifo with dynars
+
+Replace set with SWAG
+
+Rename SWAG to RING?
+
+Rename cursor to iterator
The first ones should be repported to the user, the second should kill
the program (or, yet better, only the msg handler)
* Allows the use of an error handler depending on the current module (ie,
The first ones should be repported to the user, the second should kill
the program (or, yet better, only the msg handler)
* Allows the use of an error handler depending on the current module (ie,
- the same philosophy than log4c using GSL's error functions)
+ the same philosophy as log4c using GSL's error functions)
[logs]
* Hijack message from a given category to another for a while (to mask
[logs]
* Hijack message from a given category to another for a while (to mask
- * add the token ring as official example
* implement the P2P protocols that macedon does. They constitute great
examples, too
* implement the P2P protocols that macedon does. They constitute great
examples, too
xbt/fifo.h \
xbt/swag.h \
xbt/config.h \
xbt/fifo.h \
xbt/swag.h \
xbt/config.h \
\
msg/msg.h \
msg/datatypes.h \
\
msg/msg.h \
msg/datatypes.h \
#include <xbt/heap.h>
#include <xbt/config.h>
#include <xbt/heap.h>
#include <xbt/config.h>
+#include <xbt/testsuite.h>
xbt/set.c \
xbt/module.c \
xbt/config.c \
xbt/set.c \
xbt/module.c \
xbt/config.c \
#include <stdarg.h>
#include "gras_config.h"
#include <stdarg.h>
#include "gras_config.h"
+#include "xbt/testsuite.h"
/* embedded ring data structure library */
#define RING_ENTRY(elem) \
/* embedded ring data structure library */
#define RING_ENTRY(elem) \
LDADD_SG=$(top_builddir)/src/libsimgrid.la
LDADD_RL=$(top_builddir)/src/libgras.la
LDADD_SG=$(top_builddir)/src/libsimgrid.la
LDADD_RL=$(top_builddir)/src/libgras.la
-xbt_ex_test_SOURCES= xbt/ex_test.c xbt/ex_test_ts.c xbt/ex_test_ts.h
xbt_ex_test_LDADD= $(LDADD_RL)
xbt_log_usage_LDADD= $(LDADD_RL)
xbt_ex_test_LDADD= $(LDADD_RL)
xbt_log_usage_LDADD= $(LDADD_RL)
for testpart in $xbt_TESTS $gras_TESTS $surf_TESTS
do
test="$test $testpart"
for testpart in $xbt_TESTS $gras_TESTS $surf_TESTS
do
test="$test $testpart"
- if echo $test | grep ';' ; then
+ if echo $test | grep ';' >/dev/null ; then
# end of test declaration found.
# we must have a space after the ;
# end of test declaration found.
# we must have a space after the ;
# Cleanup test declaration, run it.
test=`echo $test | sed 's/;//'`
# Cleanup test declaration, run it.
test=`echo $test | sed 's/;//'`
- tests_nb=`expr $tests_nb + 1`
- echo "#### Test $test"
- if [ x@EXEEXT@ = x ] ; then
- :
+ if [ ".$1" = .windump ] ; then
+ test=`echo $test | sed 's|/home.*testsuite/|//10.0.2.4/qemu/testsuite/|'`
+ test=`echo $test | sed 's|/|\\\\|g'`
+ echo "\\\\10.0.2.4\\qemu\\testsuite\\$test"
+ echo "@if errorlevel 1 echo ERRORERRORERRORERRORERRORERRORERRORERRORERRORERRORERRORERROR"
+ test=""
- # overwrites "valgrind" as a value, but should be exclusive.
- exenv=wine
- fi
- exenvsave=$exenv
- if [ "x$test" = "xxbt/dict_crash@EXEEXT@" ] ; then
- if echo $exenv | grep valgrind >/dev/null ; then
- exenv=
+ tests_nb=`expr $tests_nb + 1`
+ echo "#### Test $test"
+ if [ x@EXEEXT@ = x ] ; then
+ :
+ else
+ # overwrites "valgrind" as a value, but should be exclusive.
+ exenv=wine
- $exenv ./$test --xbt-log="root.thres=info" 2>&1
- retval=$?
- else
- if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then
- if echo ${test} | grep @EXEEXT@ >/dev/null ; then : ; else
- exenv=""
+ exenvsave=$exenv
+ if [ "x$test" = "xxbt/dict_crash@EXEEXT@" ] ; then
+ if echo $exenv | grep valgrind >/dev/null ; then
+ exenv=
+ fi
+ $exenv ./$test --xbt-log="root.thres=info" 2>&1
+ retval=$?
+ else
+ if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then
+ if echo ${test} | grep @EXEEXT@ >/dev/null ; then : ; else
+ exenv=""
+ fi
+ $exenv ./$test --xbt-log="root.thres=info" 2>&1
+ retval=$?
- $exenv ./$test --xbt-log="root.thres=info" 2>&1
- retval=$?
- fi
- exenv=$exenvsave
- if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
- echo "## failed" # . Rerun $test with full details."
+ exenv=$exenvsave
+ if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
+ echo "## failed" # . Rerun $test with full details."
# if [ "x$test" = "xdict_crash" ] ; then
# $exenv ./$test --xbt-log="root.thres=debug" 2>&1
# else
# $exenv ./$test --xbt-log="root.thres=debug" 2>&1
# fi
# if [ "x$test" = "xdict_crash" ] ; then
# $exenv ./$test --xbt-log="root.thres=debug" 2>&1
# else
# $exenv ./$test --xbt-log="root.thres=debug" 2>&1
# fi
- failed_nb=`expr $failed_nb + 1`
- echo " $test (returned $retval)" >> test.failed
- else # retval == 77
- echo "## Ignored since it returned 77"
- ignored_nb=`expr $ignored_nb + 1`
- echo " $test" >> test.ignored
- fi else
- echo "## Success"
- success_nb=`expr $success_nb + 1`
- echo " $test" >> test.success
- fi
- test=""
- fi # end of ';' found in test declaration => run it
+ failed_nb=`expr $failed_nb + 1`
+ echo " $test (returned $retval)" >> test.failed
+ else # retval == 77
+ echo "## Ignored since it returned 77"
+ ignored_nb=`expr $ignored_nb + 1`
+ echo " $test" >> test.ignored
+ fi else
+ echo "## Success"
+ success_nb=`expr $success_nb + 1`
+ echo " $test" >> test.success
+ fi
+ test=""
+ fi # end of ';' found in test declaration => run it
+ fi # end of run it only if not in windump mode
done
###
### Display summary
###
done
###
### Display summary
###
+if [ ".$1" = .windump ] ; then
+ echo pause
+ exit 0
+fi
#include <time.h>
#include <string.h>
#include <time.h>
#include <string.h>
+#include "xbt/testsuite.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/ex.h"
#include "xbt/log.h"