Changeset 351

Timestamp:

04/17/15 00:07:22 (10 years ago)

Author:

Maciej Komosinski

Message:

Renamed simil_match_test.cpp -> simil_unittests.cpp

Location:

cpp/frams

Files:

• Makefile-SDK (modified) (2 diffs)
• Makefile-SDK-files (modified) (1 diff)
• _demos/simil_unittests.cpp (moved) (moved from cpp/frams/_demos/simil_match_test.cpp)

cpp/frams/Makefile-SDK

@@ -5 +5 @@
 include frams/Makefile-SDK-files
 
-SDK_TESTS=genoconv_test genomanipulation geno_test genooper_test genooper_test_fTest neuro_test loader_test loader_test_param serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test simil_test simil_unit_test
+SDK_TESTS=genoconv_test genomanipulation geno_test genooper_test genooper_test_fTest neuro_test loader_test loader_test_param serial_test multiline_f0_test f0_variants_test full_props shapeconvert part_shapes neuro_layout_test geometry_apices_test geometry_info_test geometry_surface_test geometry_volume_test simil_test simil_unittests
 
 sdk_tests: $(SDK_TESTS)
@@ -76 +76 @@
         $(CXX) $(SIMIL_TEST_OBJS) $(LDFLAGS) -o $@
         
-simil_unit_test: $(SIMIL_UNIT_TEST_OBJS)
-        $(CXX) $(SIMIL_UNIT_TEST_OBJS) $(LDFLAGS) -o $@
+simil_unittests: $(SIMIL_UNITTESTS_OBJS)
+        $(CXX) $(SIMIL_UNITTESTS_OBJS) $(LDFLAGS) -o $@
 
 #############################################
 
-ALL_OBJS=$(GENOMANIPULATION_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS) $(SIMIL_TEST_OBJS) $(SIMIL_UNIT_TEST_OBJS)
+ALL_OBJS=$(GENOMANIPULATION_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS) $(GEOMETRY_APICES_TEST_OBJS) $(GEOMETRY_INFO_TEST_OBJS) $(GEOMETRY_SURFACE_TEST_OBJS) $(GEOMETRY_VOLUME_TEST_OBJS) $(SIMIL_TEST_OBJS) $(SIMIL_UNITTESTS_OBJS)
 
 include frams/Makefile-maintain

cpp/frams/Makefile-SDK-files

@@ -68 +68 @@
      frams/_demos/genotypeloader.o frams/virtfile/virtfile.o frams/param/multiparamload.o frams/virtfile/stdiofile.o frams/errmgr/stdouterr.o $(SDK_OBJS) $(GENOCONV_SDK_OBJS) $(GENMAN_SDK_OBJS)
 
-SIMIL_UNIT_TEST_OBJS=frams/_demos/simil_match_test.o frams/model/similarity/simil_match.o 
+SIMIL_UNITTESTS_OBJS=frams/_demos/simil_unittests.o frams/model/similarity/simil_match.o