Skip to content

Commit 18ff5db

Browse files
authoredDec 30, 2017
Merge pull request #341 from timvideos/cr-lf
Use CRLF line-endings
2 parents d60c5ec + 2d19470 commit 18ff5db

20 files changed

+279
-182
lines changed
 

‎Makefile

+8-3
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,12 @@ firmware-clear: firmware-clear-$(PLATFORM)
207207
firmware-clean:
208208
rm -rf $(TARGET_BUILD_DIR)/software
209209

210+
firmware-test:
211+
scripts/check-firmware-newlines.sh
212+
210213
.PHONY: firmware-load-$(PLATFORM) firmware-flash-$(PLATFORM) firmware-flash-py firmware-connect-$(PLATFORM) firmware-clear-$(PLATFORM)
211214
.NOTPARALLEL: firmware-load-$(PLATFORM) firmware-flash-$(PLATFORM) firmware-flash-py firmware-connect-$(PLATFORM) firmware-clear-$(PLATFORM)
212-
.PHONY: firmware-cmd $(FIRMWARE_FILEBASE).bin firmware firmware-load firmware-flash firmware-connect firmware-clean
215+
.PHONY: firmware-cmd $(FIRMWARE_FILEBASE).bin firmware firmware-load firmware-flash firmware-connect firmware-clean firmware-test
213216
.NOTPARALLEL: firmware-cmd firmware-load firmware-flash firmware-connect
214217

215218
$(BIOS_FILE): firmware-cmd
@@ -345,6 +348,7 @@ help:
345348
@echo ""
346349
@echo "Firmware make commands avaliable:"
347350
@echo " make firmware - Build the firmware"
351+
@echo " make firmware-test - Run firmware tests"
348352
@echo " make firmware-load - *Temporarily* load the firmware onto a device"
349353
@echo " make firmware-flash - *Permanently* flash the firmware onto a device"
350354
@echo " make firmware-connect - *Connect* to the firmware running on a device"
@@ -358,6 +362,7 @@ help:
358362
@echo ""
359363
@echo "Other Make commands avaliable:"
360364
@make -s help-$(PLATFORM)
365+
@echo " make test - Run all tests"
361366
@echo " make clean - Clean all build artifacts."
362367

363368
reset: reset-$(PLATFORM)
@@ -383,8 +388,8 @@ test-submodules: $(addsuffix /.git,$(addprefix third_party/,$(TEST_MODULES)))
383388
test-edid: test-submodules
384389
$(MAKE) -C test/edid check
385390

386-
test:
387-
true
391+
test: firmware-test
392+
@echo "Tests passed"
388393

389394
.PHONY: test test-edid
390395
.NOTPARALLEL: test test-edid

0 commit comments

Comments
 (0)
Please sign in to comment.