+xbt_tests = \
+ xbt/log_usage \
+ xbt/heap_bench \
+ xbt/graphxml_usage \
+ xbt/context_usage
+
+RL_tests = \
+ gras/trp_tcp_client gras/trp_tcp_server \
+ gras/trp_file_client gras/trp_file_server \
+ gras/datadesc_usage
+
+SG_tests = \
+ surf/maxmin_usage surf/maxmin_bench surf/simeng_usage \
+ surf/trace_usage surf/surf_usage surf/surf_usage2
+#if HAVE_SDP
+# SG_tests+=surf/sdp_usage
+#endif
+
+simdag_tests = simdag/sd_test
+
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests) $(simdag_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage
+TESTS=run_tests
+
+test: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+ ./run_tests
+valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS)
+ ./run_tests valgrind
+
+# LDADD_UTILS is still a separate var to distinguish core tester from RL tester
+LDADD_SG=$(abs_top_builddir)/src/libsimgrid.la
+LDADD_RL=$(abs_top_builddir)/src/libgras.la
+
+xbt_log_usage_LDADD= $(LDADD_RL)