From 47ffed3e3007c3ad80d896e4c69eb7dc0e6bf847 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 12 Sep 2007 15:07:18 +0000 Subject: [PATCH 1/1] Do not comment the tests concerning architectures for which we didn't regenerate the data file, but do test them, and mark them as 'expected failure' in the Makefile; also, the big32 architecture was renamed big32_8 git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4595 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- teshsuite/Makefile.am | 22 +++++++++++------- teshsuite/Makefile.in | 18 +++++++++++--- .../gras/{datadesc.big32 => datadesc.big32_8} | Bin teshsuite/gras/datadesc_r_big32_2.tesh | 21 +++++++++++++++++ teshsuite/gras/datadesc_r_big32_8.tesh | 21 +++++++++++++++++ teshsuite/gras/datadesc_r_big32_8_4.tesh | 21 +++++++++++++++++ 6 files changed, 91 insertions(+), 12 deletions(-) rename teshsuite/gras/{datadesc.big32 => datadesc.big32_8} (100%) create mode 100644 teshsuite/gras/datadesc_r_big32_2.tesh create mode 100644 teshsuite/gras/datadesc_r_big32_8.tesh create mode 100644 teshsuite/gras/datadesc_r_big32_8_4.tesh diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am index bddf4e4eff..f8c4ed073c 100644 --- a/teshsuite/Makefile.am +++ b/teshsuite/Makefile.am @@ -6,7 +6,7 @@ CLEANFILES = gras/datadesc_usage.out datadesc_usage.out EXTRA_DIST=run_tests.in \ gras/datadesc.little32 gras/datadesc.little32_4 \ gras/datadesc.little64\ - gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \ + gras/datadesc.big32_8 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \ gras/mk_datadesc_structs.pl @@ -16,16 +16,20 @@ TESTS = xbt/parallel_log_crashtest.tesh \ gras/trp_file_usage.tesh \ gras/datadesc_mem.tesh \ gras/datadesc_rw.tesh \ - gras/datadesc_r_little32.tesh \ gras/datadesc_r_little32_4.tesh \ - gras/datadesc_r_little64.tesh - -# Data sets still to regenerate: -# gras/datadesc_usage_little32_4.tesh -# gras/datadesc_usage --read ./gras/datadesc.big32; \ -# gras/datadesc_usage --read ./gras/datadesc.big32_8_4; \ -# gras/datadesc_usage --read ./gras/datadesc.big32_2; + gras/datadesc_r_little64.tesh \ + \ + gras/datadesc_r_little32.tesh \ + gras/datadesc_r_big32_8.tesh \ + gras/datadesc_r_big32_8_4.tesh \ + gras/datadesc_r_big32_2.tesh +# Data sets still to regenerate: +XFAIL_TESTS= \ + gras/datadesc_r_little32.tesh \ + gras/datadesc_r_big32_8.tesh \ + gras/datadesc_r_big32_8_4.tesh \ + gras/datadesc_r_big32_2.tesh noinst_PROGRAMS = \ xbt/parallel_log_crashtest \ diff --git a/teshsuite/Makefile.in b/teshsuite/Makefile.in index 77ebe744c0..d8ec0cd5aa 100644 --- a/teshsuite/Makefile.in +++ b/teshsuite/Makefile.in @@ -242,7 +242,7 @@ CLEANFILES = gras/datadesc_usage.out datadesc_usage.out EXTRA_DIST = run_tests.in \ gras/datadesc.little32 gras/datadesc.little32_4 \ gras/datadesc.little64\ - gras/datadesc.big32 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \ + gras/datadesc.big32_8 gras/datadesc.big32_8_4 gras/datadesc.big32_2 \ gras/mk_datadesc_structs.pl TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh @@ -251,9 +251,21 @@ TESTS = xbt/parallel_log_crashtest.tesh \ gras/trp_file_usage.tesh \ gras/datadesc_mem.tesh \ gras/datadesc_rw.tesh \ - gras/datadesc_r_little32.tesh \ gras/datadesc_r_little32_4.tesh \ - gras/datadesc_r_little64.tesh + gras/datadesc_r_little64.tesh \ + \ + gras/datadesc_r_little32.tesh \ + gras/datadesc_r_big32_8.tesh \ + gras/datadesc_r_big32_8_4.tesh \ + gras/datadesc_r_big32_2.tesh + + +# Data sets still to regenerate: +XFAIL_TESTS = \ + gras/datadesc_r_little32.tesh \ + gras/datadesc_r_big32_8.tesh \ + gras/datadesc_r_big32_8_4.tesh \ + gras/datadesc_r_big32_2.tesh LDADD_SG = $(abs_top_builddir)/src/libsimgrid.la LDADD_RL = $(abs_top_builddir)/src/libgras.la diff --git a/teshsuite/gras/datadesc.big32 b/teshsuite/gras/datadesc.big32_8 similarity index 100% rename from teshsuite/gras/datadesc.big32 rename to teshsuite/gras/datadesc.big32_8 diff --git a/teshsuite/gras/datadesc_r_big32_2.tesh b/teshsuite/gras/datadesc_r_big32_2.tesh new file mode 100644 index 0000000000..bc8c9362cb --- /dev/null +++ b/teshsuite/gras/datadesc_r_big32_2.tesh @@ -0,0 +1,21 @@ + +p Check the marshaling facilities (trying to read the result of linux/mips?) +$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_2 --log=root.fmt:%m%n +> This datafile was generated on big32_2 (8). +> ---- Test on integer ---- +> ---- Test on float ---- +> ---- Test on double ---- +> ---- Test on fixed array ---- +> ---- Test on a reference to an integer ---- +> ---- Test on string (ref to dynamic array) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on all possible struct having 3 fields (49 structs) ---- +> ---- Test on homogeneous structure ---- +> ---- Test on heterogeneous structure ---- +> ---- Test on nested structures ---- +> ---- Test on chained list ---- +> ---- Test on graph (cyclique chained list of 3 items) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ---- +> ---- Test on struct containing dynamic array and its size (cbps test) ---- +> Exiting GRAS diff --git a/teshsuite/gras/datadesc_r_big32_8.tesh b/teshsuite/gras/datadesc_r_big32_8.tesh new file mode 100644 index 0000000000..3410675d80 --- /dev/null +++ b/teshsuite/gras/datadesc_r_big32_8.tesh @@ -0,0 +1,21 @@ + +p Check the marshaling facilities (trying to read the result of ppc or sparc) +$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_8 --log=root.fmt:%m%n +> This datafile was generated on big32_8 (5). +> ---- Test on integer ---- +> ---- Test on float ---- +> ---- Test on double ---- +> ---- Test on fixed array ---- +> ---- Test on a reference to an integer ---- +> ---- Test on string (ref to dynamic array) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on all possible struct having 3 fields (49 structs) ---- +> ---- Test on homogeneous structure ---- +> ---- Test on heterogeneous structure ---- +> ---- Test on nested structures ---- +> ---- Test on chained list ---- +> ---- Test on graph (cyclique chained list of 3 items) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ---- +> ---- Test on struct containing dynamic array and its size (cbps test) ---- +> Exiting GRAS diff --git a/teshsuite/gras/datadesc_r_big32_8_4.tesh b/teshsuite/gras/datadesc_r_big32_8_4.tesh new file mode 100644 index 0000000000..c01a005940 --- /dev/null +++ b/teshsuite/gras/datadesc_r_big32_8_4.tesh @@ -0,0 +1,21 @@ + +p Check the marshaling facilities (trying to read the result of AIX) +$ gras/datadesc_usage --read ${srcdir:=.}/gras/datadesc.big32_8_4 --log=root.fmt:%m%n +> This datafile was generated on big32_8_4 (6). +> ---- Test on integer ---- +> ---- Test on float ---- +> ---- Test on double ---- +> ---- Test on fixed array ---- +> ---- Test on a reference to an integer ---- +> ---- Test on string (ref to dynamic array) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on all possible struct having 3 fields (49 structs) ---- +> ---- Test on homogeneous structure ---- +> ---- Test on heterogeneous structure ---- +> ---- Test on nested structures ---- +> ---- Test on chained list ---- +> ---- Test on graph (cyclique chained list of 3 items) ---- +> ---- Test on dynar containing integers ---- +> ---- Test on the PBIO IEEE struct (also tests GRAS DEFINE TYPE) ---- +> ---- Test on struct containing dynamic array and its size (cbps test) ---- +> Exiting GRAS -- 2.20.1