cleanup of unit-test files (Makefile.in, Makefile.files. CMakeLists.txt in e)

Author: mikestillman

M2/Macaulay2/e/CMakeLists.txt

@@ -392,14 +392,6 @@ foreach(LIB IN LISTS LIBRARIES_LIST)
   endif()
 endforeach()
 
-foreach(LIB IN LISTS LIBRARY_LIST)
-  if(${LIB}_FOUND)
-    target_link_libraries(M2-engine PUBLIC ${${LIB}_LIBRARY})
-    target_include_directories(M2-engine PUBLIC
-        "$<BUILD_INTERFACE:${${LIB}_INCLUDE_DIR}>")
-  endif()
-endforeach()
-    
 # Compiler warning flags
 target_compile_options(M2-engine PRIVATE
   -Wno-cast-qual # FIXME
@@ -460,14 +452,16 @@ if(BUILD_TESTING)
     unit-tests/ARingTest.hpp
     unit-tests/ARingZZTest.cpp
     unit-tests/ARingZZpTest.cpp
-#    unit-tests/ARingGFTest.cpp # FIXME: see aring-gf-givaro.cpp:199
+#    unit-tests/ARingGFTest.cpp # TODO: needs rework - ARingGFFlint API has changed
     unit-tests/ARingQQFlintTest.cpp
     unit-tests/ARingQQGmpTest.cpp
     unit-tests/ARingRRTest.cpp
     unit-tests/ARingCCTest.cpp
     unit-tests/ARingRRRTest.cpp
+    unit-tests/ARingRRiTest.cpp
     unit-tests/ARingCCCTest.cpp
     unit-tests/NCGroebnerTest.cpp
+#    unit-tests/WeylAlgebraTest.cpp # TODO: add this file
 
     unit-tests/RingTest.hpp
     unit-tests/RingZZTest.cpp

M2/Macaulay2/e/unit-tests/Makefile.files

@@ -28,31 +28,20 @@ UNITTEST_CCFILES := \
     PolyRingTest \
     NewF4Test \
     MonoidTest \
-    MatrixIOTest
+    MatrixIOTest \
+    RingRRRTest \
+    RingCCCTest
 
-#    RingRRRTest \
-#    RingCCCTest \
-#    ARingGFTest \
-     
+#    WeylAlgebraTest \ # TODO: add in this file
 
-SHARED_UNITTEST_CFILES += \
-
-UNITTEST_CFILES += \
-    $(SHARED_UNITTEST_CFILES)
+#    ARingGFTest
 
 UNITTEST_TARGET := testMain
 
 GTEST_DIR := $(BUILTLIBPATH)/include/gtest
 
-E_FILES := $(addprefix ../, $(INTERFACE) $(COMMANDS) $(C_FILES))
-F4_FILES := $(addprefix ../f4/, $(F4_CCFILES))
-E_OBJECT_FILES := $(addsuffix .o, $(E_FILES) $(F4_FILES))
-
-UNITTEST_FILES := $(UNITTEST_CCFILES) $(UNITTEST_CFILES)
-UNITTEST_SHARED_FILES := $(SHARED_UNITTEST_CCFILES) $(SHARED_UNITTEST_CFILES)
-
-UNITTEST_OBJECT_FILES :=  $(addsuffix .o, $(UNITTEST_FILES))
-UNITTEST_SHARED_OBJECT_FILES :=  $(addsuffix .o, $(UNITTEST_SHARED_FILES))
+UNITTEST_OBJECT_FILES :=  $(addsuffix .o, $(UNITTEST_CCFILES))
+UNITTEST_SHARED_OBJECT_FILES :=  $(addsuffix .o, $(SHARED_UNITTEST_CCFILES))
 
 # Local Variables:
 # compile-command: "make -C $M2BUILDDIR/Macaulay2/e/unit-tests check"

M2/Macaulay2/e/unit-tests/Makefile.in

@@ -9,96 +9,37 @@ include @srcdir@/Makefile.files
 export LD_LIBRARY_PATH := $(BUILTLIBPATH)/lib:$(LD_LIBRARY_PATH)
 
 CPPFLAGS := -I. -I@srcdir@  -I@srcdir@/..  $(CPPFLAGS) \
-     -isystem $(GTEST_DIR) -isystem $(GTEST_DIR)/include \
-	 -I@srcdir@/../../c #-Wno-unused-local-typedefs # ffpack has some of these.
-CXXFLAGS += -std=gnu++17 -Wno-sign-conversion #-Wno-unused-local-typedefs -coverage
+     -isystem $(GTEST_DIR) -isystem $(GTEST_DIR)/include
+CXXFLAGS += -std=gnu++17 -Wno-sign-conversion
 
-# note: on some machines, gcc can't find -lstdc++
 LOADLIBES += @BUILTLIBS@ @LINALGLIBS@ @LIBS@ @FCLIBS@ -lgtest -pthread
 
-.PHONY: place_into_lib runtests
+.PHONY: runtests
 
 all: $(UNITTEST_OBJECT_FILES) $(LIBENGINE)
-	echo @BUILTLIBS@
-	echo @LIBS@
 
-# disabling a test temporarily, because it doesn't compile
-#check:
-#	@ echo "makefile: Warning : skipping temporarily disabled test in e/unit-test"
 check: runtests
 
 fullCheck: $(UNITTEST_TARGET)
 	valgrind --track-origins=yes ./$(UNITTEST_TARGET)
 
-$(UNITTEST_TARGET) : $(UNITTEST_OBJECT_FILES) $(LIBENGINE) # ../../system/supervisor.o
+$(UNITTEST_TARGET) : $(UNITTEST_OBJECT_FILES) $(LIBENGINE)
 	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
 
 runtests: $(UNITTEST_TARGET)
 	time ./$(UNITTEST_TARGET)
 
-ARingRRRTest :  ARingRRRTest.o $(UNITTEST_SHARED_OBJECT_FILES) $(LIBENGINE)
-	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
-
-ARingRRiTest :  ARingRRiTest.o $(UNITTEST_SHARED_OBJECT_FILES) $(LIBENGINE)
-	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
-
-ARingGFTest :  ARingGFTest.o $(UNITTEST_SHARED_OBJECT_FILES) $(LIBENGINE) # ../../system/supervisor.o
-	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
-
-NCGroebnerTest :  NCGroebnerTest.o $(UNITTEST_SHARED_OBJECT_FILES) $(LIBENGINE) # ../../system/supervisor.o
-	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
-
-runNCGroebnerTest : NCGroebnerTest
-	time ./NCGroebnerTest
-
-ARingRRRZZpTest : \
-    ARingZZpTest.o  \
-    ARingRRRTest.o \
-    ARingZZpTest.o \
-    RingZZTest.o \
-    RingZZpTest.o \
-    RingQQTest.o \
-    RingRRRTest.o \
-    RingCCCTest.o \
-    $(UNITTEST_SHARED_OBJECT_FILES) $(LIBENGINE)
-	@CXX@ $(LDFLAGS) $^ $(LOADLIBES) -o $@
-
-checkGivaro: GivaroTest
-
-GivaroTest: GivaroTest.o
-	@CXX@ $(LDFLAGS) $^ -lgivaro -lgmp -lgmpxx -o $@
-
-checkRingRRR: ARingRRRTest
-	time ./ARingRRRTest
-
-checkRingRRi: ARingRRiTest
-	time ./ARingRRiTest
-
-#fails for whatever reasons
-checkRingRRRZZp: ARingRRRZZpTest
-	time ./ARingRRRZZpTest
-
-
-# fails on my 32-bit fedora 14 , gcc is 4.5.1. 
-failing: checkRingRRRZZp
-
-
-%.s : %.c; $(COMPILE.cc) -S $< $(OUTPUT_OPTION)
-
 MORE_OPTIONS = -Wno-cast-qual
-COMPILE.c += $(MORE_OPTIONS)
 COMPILE.cc += $(MORE_OPTIONS)
 
-
 Makefile: Makefile.in; cd ../../..; ./config.status Macaulay2/e/unit-tests/Makefile
 clean::; rm -f *.o *.rpo *.dep dep-*.tmp LOGFILE testMain
 distclean: clean; rm -f Makefile
 
 ifeq "$(DEPENDS)" "yes"
-include $(UNITTEST_CFILES:=.dep) $(UNITTEST_CCFILES:=.dep)
+include $(UNITTEST_CCFILES:=.dep)
 endif
 
 # Local Variables:
 # compile-command: "make -C $M2BUILDDIR/Macaulay2/e/unit-tests check"
 # End:
-.NOTPARALLEL: