allow specific test for make check

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index a91798587862156cd66aebf3f98f2b5ceaab3307..efd905229bdf6dfdf0d853eba1056a0dbce0442a 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -33,6 +33,10 @@ PNACL_TOOLCHAIN_ROOT ?= $(shell readlink -e $(TOOLCHAIN_ROOT)/pnacl_newlib_raw)
 # The location of PNaCl tools (e.g., binutils objdump, pnacl-clang++, etc.).
 PNACL_BIN_PATH ?= $(shell readlink -e $(PNACL_TOOLCHAIN_ROOT)/bin)
 
+# Allow tests_lit to be overidden

[Jim Stichnoth, 2016/01/20 17:35:52]

I would make the comment a bit more verbose/helpful, e.g.

# Allow tests to be overridden, e.g.:
#   make check-lit CHECK_LIT_TESTS="tests_lit/llvm2ice_tests/{alloc,arith}.ll"

I would also like to add an example of CHECK_XTEST_TESTS, but I can't get
anything to work!  Did you have any luck?

[rkotlerimgtec, 2016/01/21 01:48:55]

These are already covered in the help for the makefile.

if you type :

make -f Makefile.standalone help 

Then you get instructions for how to get further help, including
examples.

make -f Makefile.standalone help-check-lit
make -f Makefile.standalone help-check-xtest

The cross test example worked for me.

[Jim Stichnoth, 2016/01/22 03:05:21]

OK - but can address the first part of my comment?  repeated/extended here:

I would make the comment a bit more verbose/helpful, e.g.

# Allow tests to be overridden, e.g.:
#   make -f Makefile.standalone check-lit \
#     CHECK_LIT_TESTS="tests_lit/llvm2ice_tests/{alloc,arith}.ll"
#   make -f Makefile.standalone check-xtest \
#     CHECK_XTEST_TESTS=crosstest/Output/simple_loop_x8632_native_O2_sse2.xtest

[rkotlerimgtec, 2016/01/22 03:48:30]

Done.

+CHECK_LIT_TESTS ?= tests_lit
+CHECK_XTEST_TESTS ?= crosstest/Output
+
 # Hack to auto-detect autoconf versus cmake build of LLVM.  If the LLVM tools
 # were dynamically linked with something like libLLVM-3.7svn.so, it is an
 # autoconf build, otherwise it is a cmake build.  AUTOCONF is set to 0 for
@@ -334,7 +338,8 @@ make_symlink: $(OBJDIR)/pnacl-sz
 	@echo "Build Attributes:"
 	@$(SHOW_BUILD_ATTS)
 
-.PHONY: all compile_only make_symlink runtime bloat sb docs
+.PHONY: all compile_only make_symlink runtime bloat sb docs help \
+	help-check-lit help-check-xtest

[Jim Stichnoth, 2016/01/20 17:35:52]

This continuation line doesn't need a tab character (though this may be moot in
light of the comment below).

[rkotlerimgtec, 2016/01/21 01:48:55]

Done.

 
 compile_only: $(OBJS)
 
@@ -415,7 +420,7 @@ runtime.is.built: $(RT_SRC) pydir/build-runtime.py
 
 check-lit: $(OBJDIR)/pnacl-sz make_symlink
 	PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
-	$(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit \
+	$(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_LIT_TESTS) \
             $(FORCEASM_LIT_TEST_EXCLUDES) $(FORCEASM_LIT_PARAM)
 
 ifdef MINIMAL
@@ -441,7 +446,7 @@ check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime
           -e arm32,neon,test_vector_ops \
           -e arm32,neon,test_select
 	PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
-	$(LLVM_SRC_PATH)/utils/lit/lit.py -sv crosstest/Output
+	$(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_XTEST_TESTS)
 endif
 
 check-unit: $(OBJDIR)/run_unittests
@@ -542,6 +547,39 @@ bloat: make_symlink
 docs:
 	make -C docs -f Makefile.standalone
 
+help:
+	@echo

[Jim Stichnoth, 2016/01/20 17:35:52]

I think this might be better accomplished by just cat'ing some help file from
the docs directory, with just a single 'help' target that dumps everything. 
This would make it easier to update, reflow text, avoid 80-col overflow, etc.

[rkotlerimgtec, 2016/01/21 01:48:55]

Done.

+	@echo
+	@echo Targets:
+	@echo
+	@echo check-lit - run the lit tests
+	@echo check-xtest - run the cross tests
+	@echo
+	@echo For more detailed help:
+	@echo
+	@echo makefile -f Makefile.standalone help-target . so for example:
+	@echo makefile -f Makefile.standalone help-check-lit
+	@echo
+	@echo
+
+help-check-lit:
+	@echo
+	@echo check-lit - run the lit tests
+	@echo
+	@echo to check a specific test, override CHECK_LIT_TESTS
+	@echo i.e. make -f Makefile.standalone check-lit CHECK_LIT_TESTS=tests_lit/llvm2ice_tests/arith.ll
+	@echo
+	@echo
+
+help-check-xtest:
+	@echo
+	@echo check-xtest - run the cross tests
+	@echo
+	@echo to check a specific test, override CHECK_XTEST_TESTS
+	@echo i.e. make -f Makefile.standalone check-xtest CHECK_XTEST_TESTS=crosstest/Output/mem_intrin_x8632_nonsfi_O2_sse2.xtest
+	@echo
+	@echo
+
 clean:
 	rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json