[test-suite] r350066 - [test-suite][mips] Disable setlocale calls in consumer-typeset test

[Simon Atanasyan via llvm-commits]

Author: atanasyan
Date: Wed Dec 26 06:37:41 2018
New Revision: 350066

URL: http://llvm.org/viewvc/llvm-project?rev=350066&view=rev
Log:
[test-suite][mips] Disable setlocale calls in consumer-typeset test

When running the test-suite through qemu an error can occur when the
host and target architecture differ in endianness. This happens when the
test calls setlocale. The glibc implementation of this call reads
/usr/lib/locale/locale-archive as raw bites. Since the endianness
doesn't match, the numbers read from the archive don't make sense and
cause the check to fail.

This patch disables the setlocale call so the test passes regardless of
endianness.

Patch by Miloš Stojanović

Differential Revision: http://reviews.llvm.org/D55708

Modified:
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt?rev=350066&r1=350065&r2=350066&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt Wed Dec 26 06:37:41 2018
@@ -1,4 +1,9 @@
 list(APPEND CPPFLAGS -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR="lout.lib" -DFONT_DIR="font" -DMAPS_DIR="maps" -DINCL_DIR="include" -DDATA_DIR="data" -DHYPH_DIR="hyph" -DLOCALE_DIR="locale" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0)
+
+if(ARCH STREQUAL "Mips")
+  list(APPEND CPPFLAGS -DCOLLATE=0 -DLOCALE_ON=0)
+endif()
+
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -x -I data/include -D data/data -F data/font -C data/maps -H data/hyph large.lout)
 

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile?rev=350066&r1=350065&r2=350066&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile Wed Dec 26 06:37:41 2018
@@ -4,6 +4,11 @@ PROG     = consumer-typeset
 # FORTIFY_SOURCE is turned off for this benchmark because the type lies at some
 # point in this program and FORIFY implementations rely on the correct type.
 CPPFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"lout.lib\" -DFONT_DIR=\"font\" -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0
+
+ifeq ($(ARCH),Mips)
+CPPFLAGS += -DCOLLATE=0 -DLOCALE_ON=0
+endif
+
 LDFLAGS  = -lm
 RUN_OPTIONS = -x -I $(PROJ_SRC_DIR)/data/include -D $(PROJ_SRC_DIR)/data/data -F $(PROJ_SRC_DIR)/data/font -C $(PROJ_SRC_DIR)/data/maps -H $(PROJ_SRC_DIR)/data/hyph $(PROJ_SRC_DIR)/large.lout