Browse Source

Remove win32/Tests, strip Makefile outputs

Lou Yihua 7 years ago
parent
commit
a4a5c7222e
5 changed files with 32 additions and 18 deletions
  1. 4 1
      .travis.yml
  2. 13 7
      unix/Makefile
  3. 15 8
      win32/Makefile
  4. 0 1
      win32/Tests/Returns0.bat
  5. 0 1
      win32/Tests/Returns1.bat

+ 4 - 1
.travis.yml

@@ -1,6 +1,9 @@
 dist: trusty
 language: c
-script: make check
+script:
+ - make
+ - make clean
+ - make check
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq libsdl2-dev libfltk1.3-dev

+ 13 - 7
unix/Makefile

@@ -25,24 +25,30 @@ TEST_CXXFLAGS += -isystem $(GTEST_DIR)/include -I $(GTEST_DIR) -g -Wall -Wextra
 all: $(TARGET)
 
 $(TARGET): $(OBJFILES)
-	$(HOST)gcc $^ -o $@ $(LDFLAGS)
+	@echo [LD] $@
+	@$(HOST)gcc $^ -o $@ $(LDFLAGS)
 
 gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc
-	$(HOST)g++ $(TEST_CXXFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)g++ $(TEST_CXXFLAGS) -c $< -o $@
 
 %.o: %.c
-	$(HOST)gcc $(CFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)gcc $(CFLAGS) -c $< -o $@
 
 %.o: %.cpp
-	$(HOST)g++ $(CXXFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)g++ $(CXXFLAGS) -c $< -o $@
 
 $(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
-	$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
+	@echo [LD] $@
+	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
 
 clean:
 	-rm -f $(TARGET) $(TEST_TARGET) *.o ../*.o ../adplug/*.o ../libmad/*.o ../liboggvorbis/src/*.o ../tests/*.o
 
 check: TEST_CCFLAGS = -DUNIT_TEST=1 -isystem $(GTEST_DIR)/include
 check: $(TEST_TARGET)
-	chmod +x $(TEST_TARGET)
-	exec $(TEST_TARGET)
+	@echo [EXEC] $(TEST_TARGET)
+	@chmod +x $(TEST_TARGET)
+	@exec $(TEST_TARGET)

+ 15 - 8
win32/Makefile

@@ -26,27 +26,34 @@ TEST_CXXFLAGS += -isystem $(GTEST_DIR)/include -I $(GTEST_DIR) -g -Wall -Wextra
 all: $(TARGET)
 
 $(TARGET): $(OBJFILES)
-	$(HOST)gcc $^ -o $@ $(LDFLAGS)
+	@echo [LD] $@
+	@$(HOST)gcc $^ -o $@ $(LDFLAGS)
 
 gtest-all.o : $(GTEST_DIR)/src/gtest-all.cc
-	$(HOST)g++ $(TEST_CXXFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)g++ $(TEST_CXXFLAGS) -c $^ -o $@
 
 %.o: %.c
-	$(HOST)gcc $(CFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)gcc $(CFLAGS) -c $^ -o $@
 
 %.o: %.cpp
-	$(HOST)g++ $(CXXFLAGS) -c $< -o $@
+	@echo [CC] $^
+	@$(HOST)g++ $(CXXFLAGS) -c $^ -o $@
 
 %.o: %.rc
-	windres -i $< -o $@
+	@echo [RES] $^
+	@windres -i $^ -o $@
 
 $(TEST_TARGET): $(OBJFILES) $(TEST_OBJFILES) gtest-all.o
-	$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
+	@echo [LD] $@
+	@$(HOST)g++ $^ -o $@ $(LDFLAGS) -lpthread
 
 clean:
 	-rm -f $(TARGET) $(TEST_TARGET) *.o ../*.o ../adplug/*.o ../libmad/*.o ../liboggvorbis/src/*.o ../tests/*.o ../native_midi/*.o
 
 check: TEST_CCFLAGS = -DUNIT_TEST=1 -isystem $(GTEST_DIR)/include
 check: $(TEST_TARGET)
-	chmod +x $(TEST_TARGET)
-	exec $(TEST_TARGET)
+	@echo [EXEC] $(TEST_TARGET)
+	@chmod +x $(TEST_TARGET)
+	@exec $(TEST_TARGET)

+ 0 - 1
win32/Tests/Returns0.bat

@@ -1 +0,0 @@
-exit 0

+ 0 - 1
win32/Tests/Returns1.bat

@@ -1 +0,0 @@
-exit 1