+CFLAGS += -DWVTEST_CONFIGURED
+wvtest_SCRIPTS += negotiation.sh
test_PROGRAMS += negotiation
negotiation_SOURCES = negotiation.c
+negotiation_LIBS = wvtest
+
+wvtest_SCRIPTS += renegotiation.sh
+test_PROGRAMS += renegotiation
+renegotiation_SOURCES = renegotiation.c
+renegotiation_LIBS = wvtest
+
+test_PROGRAMS += spare_capacity
+spare_capacity_SOURCES = spare_capacity.c
+
+ifeq ($(CONFIG_AQUOSA),y)
+test_PROGRAMS += cpu_spare_capacity
+cpu_spare_capacity_SOURCES = cpu_spare_capacity.c
+
+test_PROGRAMS += cpu_renegotiation
+cpu_renegotiation_SOURCES = cpu_renegotiation.c
+endif
+
+test_PROGRAMS += dummy_renegotiation
+dummy_renegotiation_SOURCES = dummy_renegotiation.c
+
+wvtest_SCRIPTS += dummy_spare_capacity.sh
+test_PROGRAMS += dummy_spare_capacity
+dummy_spare_capacity_SOURCES = dummy_spare_capacity.c
+dummy_spare_capacity_LIBS = wvtest
+
+wvtest_SCRIPTS += trans_nego.sh
+test_PROGRAMS += trans_nego
+trans_nego_SOURCES = trans_nego.c
+trans_nego_LIBS = wvtest
+test_PROGRAMS += trans_nego2
+trans_nego2_SOURCES = trans_nego2.c
+trans_nego2_LIBS = wvtest
+
+test_PROGRAMS += negobench
+negobench_SOURCES = negobench.c
+
+test_PROGRAMS += renegobench
+renegobench_SOURCES = renegobench.c
+
+test_PROGRAMS += scbench
+scbench_SOURCES = scbench.c
+
lib_LOADLIBES += pthread rt frsh
ifeq ($(CONFIG_FWP),y)
-test_PROGRAMS += distributed
-distributed_SOURCES+= distributed.c
-lib_LOADLIBES += pthread rt fwp fna frsh
+SUBDIRS= fwptest pingpong
endif
ifeq ($(CONFIG_ORTE_TEST),y)