Merge pull request #341 from timvideos/cr-lf

Use CRLF line-endings
timvideos · Dec 30, 2017 · 18ff5db · 18ff5db
2 parents d60c5ec + 2d19470
commit 18ff5db
Show file tree

Hide file tree

Showing 20 changed files with 279 additions and 182 deletions.
diff --git a/Makefile b/Makefile
@@ -207,9 +207,12 @@ firmware-clear: firmware-clear-$(PLATFORM)
 firmware-clean:
 	rm -rf $(TARGET_BUILD_DIR)/software
 
+firmware-test:
+	scripts/check-firmware-newlines.sh
+
 .PHONY: firmware-load-$(PLATFORM) firmware-flash-$(PLATFORM) firmware-flash-py firmware-connect-$(PLATFORM) firmware-clear-$(PLATFORM)
 .NOTPARALLEL: firmware-load-$(PLATFORM) firmware-flash-$(PLATFORM) firmware-flash-py firmware-connect-$(PLATFORM) firmware-clear-$(PLATFORM)
-.PHONY: firmware-cmd $(FIRMWARE_FILEBASE).bin firmware firmware-load firmware-flash firmware-connect firmware-clean
+.PHONY: firmware-cmd $(FIRMWARE_FILEBASE).bin firmware firmware-load firmware-flash firmware-connect firmware-clean firmware-test
 .NOTPARALLEL: firmware-cmd firmware-load firmware-flash firmware-connect
 
 $(BIOS_FILE): firmware-cmd
@@ -345,6 +348,7 @@ help:
 	@echo ""
 	@echo "Firmware make commands avaliable:"
 	@echo " make firmware          - Build the firmware"
+	@echo " make firmware-test     - Run firmware tests"
 	@echo " make firmware-load     - *Temporarily* load the firmware onto a device"
 	@echo " make firmware-flash    - *Permanently* flash the firmware onto a device"
 	@echo " make firmware-connect  - *Connect* to the firmware running on a device"
@@ -358,6 +362,7 @@ help:
 	@echo ""
 	@echo "Other Make commands avaliable:"
 	@make -s help-$(PLATFORM)
+	@echo " make test              - Run all tests"
 	@echo " make clean             - Clean all build artifacts."
 
 reset: reset-$(PLATFORM)
@@ -383,8 +388,8 @@ test-submodules: $(addsuffix /.git,$(addprefix third_party/,$(TEST_MODULES)))
 test-edid: test-submodules
 	$(MAKE) -C test/edid check
 
-test:
-	true
+test: firmware-test
+	@echo "Tests passed"
 
 .PHONY: test test-edid
 .NOTPARALLEL: test test-edid