-core_tests = \
- dynar_int dynar_double dynar_string \
- dict_usage dict_crash \
- set_usage \
- log_usage \
- config_usage
-# multidict_crash
-
-RL_tests = \
- trp_tcp_client trp_tcp_server \
- trp_file_client trp_file_server \
- datadesc_usage
-
-SG_tests =
-
-noinst_PROGRAMS = $(core_tests) $(RL_tests) $(SG_tests)
-noinst_SCRIPTS = run_tests trp_tcp_usage
+xbt_tests = \
+ xbt/dynar_int xbt/dynar_double xbt/dynar_string \
+ xbt/dict_usage xbt/dict_crash \
+ xbt/set_usage \
+ xbt/log_usage \
+ xbt/heap_bench \
+ xbt/swag_usage \
+ xbt/config_usage
+# xbt/multidict_crash
+
+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
+
+check_PROGRAMS = $(xbt_tests) $(RL_tests) $(SG_tests)
+check_SCRIPTS = run_tests gras/trp_tcp_usage