Fix error message.

[riscv-isa-sim.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a0f119ab34a60edc5ad31fcd1937ae50af3cb94e..cdceb8227c01edfb383a8e0d039a1457c947aad3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,7 @@ install_exes_dir := $(INSTALLDIR)/bin
 sprojs         := @subprojects@
 sprojs_enabled := @subprojects_enabled@
 
-sprojs_include := -I. $(addprefix -I$(src_dir)/, $(sprojs_enabled))
+sprojs_include := -I. -I$(src_dir) $(addprefix -I$(src_dir)/, $(sprojs_enabled))
 VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 
 #-------------------------------------------------------------------------
@@ -84,9 +84,9 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 
 CC            := @CC@
 CXX           := @CXX@
-CFLAGS        += @CFLAGS@ -DPREFIX=\"$(prefix)\"
+CFLAGS        += @CFLAGS@ -DPREFIX=\"$(prefix)\" -Werror
 CPPFLAGS      += @CPPFLAGS@
-CXXFLAGS      += @CXXFLAGS@ -DPREFIX=\"$(prefix)\"
+CXXFLAGS      += @CXXFLAGS@ -DPREFIX=\"$(prefix)\" -Werror
 COMPILE       := $(CXX) -fPIC -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
                  $(sprojs_include)
 COMPILE_C     := $(CC) -fPIC -MMD -MP $(CPPFLAGS) $(CFLAGS) \
@@ -121,7 +121,7 @@ INSTALL_EXE   := $(INSTALL) -m 555
 STOW          := @stow@
 
 # Tests
-bintests = tests/gdbserver-smoke.py
+bintests = $(src_dir)/tests/ebreak.py
 
 #-------------------------------------------------------------------------
 # Include subproject makefile fragments
@@ -338,10 +338,12 @@ junk += $(bintest_outs)
        ./$* < /dev/null 2>&1 | tee $@
 
 check-cpp : $(test_outs)
-       echo; grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null; echo
+       @echo
+       ! grep -h -e'Unit Tests' -e'FAILED' -e'Segmentation' $^ < /dev/null
+       @echo
 
 check-bin : $(bintest_outs)
-       tail -n 1 $^ < /dev/null
+       ! tail -n 1 $^ < /dev/null 2>&1 | grep FAILED
 
 check : check-cpp check-bin