* test/test_olena.cc: Rename as... * test/test_milena.cc: ...this. Aesthetic changes. * test/Makefile.am: Adjust. --- dynamic-use-of-static-c++/ChangeLog | 9 +++++++++ dynamic-use-of-static-c++/test/Makefile.am | 16 +++++++++++----- .../test/{test_olena.cc => test_milena.cc} | 7 ++----- 3 files changed, 22 insertions(+), 10 deletions(-) rename dynamic-use-of-static-c++/test/{test_olena.cc => test_milena.cc} (82%) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 9eff03c..d1f8345 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,12 @@ +2009-11-02 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Rename test/test_olena as test/test_milena. + + * test/test_olena.cc: Rename as... + * test/test_milena.cc: ...this. + Aesthetic changes. + * test/Makefile.am: Adjust. + 2009-10-30 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Simplify the construction of dyn.data objects in SWIG wrappers. diff --git a/dynamic-use-of-static-c++/test/Makefile.am b/dynamic-use-of-static-c++/test/Makefile.am index 25cec5d..fd65b67 100644 --- a/dynamic-use-of-static-c++/test/Makefile.am +++ b/dynamic-use-of-static-c++/test/Makefile.am @@ -27,7 +27,7 @@ SUBDIRS = vaucanson #erb# containers #erb# var_and_val #erb# methods -#erb# olena +#erb# milena #erb# ] #erb# %> #erb# check_PROGRAMS = <%= TESTS.map { |t| "#{t}.test" }.join ' ' %> @@ -40,7 +40,13 @@ SUBDIRS = vaucanson #erb# =generated -check_PROGRAMS = function_loader.test damien.test containers.test var_and_val.test methods.test olena.test +check_PROGRAMS = function_loader.test damien.test containers.test var_and_val.test methods.test milena.test + +# FIXME: Factor *_LDADD variables. +# FIXME: *_DEPENDENCIES are probably useless. +# FIXME: Use Automake 1.11's default extension for tests? +# FIXME: If the code reduces to a single definition of +# `check_PROGRAM', stop using erbx. function_loader_test_SOURCES = test_function_loader.cc function_loader_test_LDADD = $(top_builddir)/src/libdyn.la @@ -62,9 +68,9 @@ methods_test_SOURCES = test_methods.cc methods_test_LDADD = $(top_builddir)/src/libdyn.la methods_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la -olena_test_SOURCES = test_olena.cc -olena_test_LDADD = $(top_builddir)/src/libdyn.la -olena_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la +milena_test_SOURCES = test_milena.cc +milena_test_LDADD = $(top_builddir)/src/libdyn.la +milena_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la #erb# =end_generated diff --git a/dynamic-use-of-static-c++/test/test_olena.cc b/dynamic-use-of-static-c++/test/test_milena.cc similarity index 82% rename from dynamic-use-of-static-c++/test/test_olena.cc rename to dynamic-use-of-static-c++/test/test_milena.cc index 3c5dd74..67d10cb 100644 --- a/dynamic-use-of-static-c++/test/test_olena.cc +++ b/dynamic-use-of-static-c++/test/test_milena.cc @@ -16,11 +16,8 @@ int main() fun println("mln::debug::println"); var ima = mk_image2d_int(3, 3); - fill(ima, 0); - println("ima_before=", ima); + println("ima (before) =", ima); iota(ima); - println("ima-after=", ima); - - std::cout << "exiting" << std::endl; + println("ima (after) =", ima); } -- 1.6.5