[PATCH] D55708: [test-suite][mips] Disable setlocale calls in consumer-typeset test

[Simon Atanasyan via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL350066: [test-suite][mips] Disable setlocale calls in consumer-typeset test (authored by atanasyan, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D55708?vs=178237&id=179509#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D55708/new/

https://reviews.llvm.org/D55708

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


Index: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
===================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
@@ -4,6 +4,11 @@
 # 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
 
Index: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
===================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
@@ -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)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D55708.179509.patch
Type: text/x-patch
Size: 2021 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181226/e37e02e5/attachment.bin>