[csw-devel] SF.net SVN: gar:[15300] csw/mgar/pkg/llvm/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Aug 10 15:37:26 CEST 2011
Revision: 15300
http://gar.svn.sourceforge.net/gar/?rev=15300&view=rev
Author: wahwah
Date: 2011-08-10 13:37:26 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
pkg/llvm/trunk: Test runner fixes
Modified Paths:
--------------
csw/mgar/pkg/llvm/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch
csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch
csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch
Modified: csw/mgar/pkg/llvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/llvm/trunk/Makefile 2011-08-10 13:16:38 UTC (rev 15299)
+++ csw/mgar/pkg/llvm/trunk/Makefile 2011-08-10 13:37:26 UTC (rev 15300)
@@ -22,21 +22,41 @@
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --disable-optimized
+# ocaml causes a compilation failure
+# http://lists.cs.uiuc.edu/pipermail/llvmbugs/2010-December/015967.html
+# http://lists.cs.uiuc.edu/pipermail/llvmbugs/2010-December/015968.html
+CONFIGURE_ARGS += --enable-bindings=none
+# CONFIGURE_ARGS += --enable-libffi
PATCHFILES += 0001-limits.h-used-for-MAX_PATH.patch
+PATCHFILES += 0002-OpenCSW-bash-for-tests.patch
+PATCHFILES += 0003-OpenCSW-bash-with-the-Python-test-runner.patch
+PATCHFILES += 0004-test-runner-adaptation-to-Solaris.patch
ENABLE_OPTIMIZED = 1
OPTIMIZE_OPTION = -O0
+SHELL = /opt/csw/bin/bash
+CONFIG_SHELL = /opt/csw/bin/bash
EXTRA_CONFIGURE_EXPORTS = ENABLE_OPTIMIZED
EXTRA_CONFIGURE_EXPORTS += OPTIMIZE_OPTION
+EXTRA_CONFIGURE_EXPORTS += CONFIG_SHELL
EXTRA_BUILD_EXPORTS = ENABLE_OPTIMIZED
EXTRA_BUILD_EXPORTS += OPTIMIZE_OPTION
+EXTRA_TEST_EXPORTS = SHELL
+
+NM = /opt/csw/bin/gnm
+EXTRA_CONFIGURE_EXPORTS += NM
+EXTRA_BUILD_EXPORTS += NM
+
VERBOSE = 1
EXTRA_CONFIGURE_EXPORTS = VERBOSE
EXTRA_BUILD_EXPORTS = VERBOSE
include gar/category.mk
+# To help the configure script find /opt/csw/gnu/nm
+PATH := /opt/csw/gnu:/usr/xpg4/bin:$(PATH)
+
# ARCHFLAGS_GCC4_sparcv8 = -m32
# Undefined symbol __sync_fetch_and_add_4
Added: csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch
===================================================================
--- csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch (rev 0)
+++ csw/mgar/pkg/llvm/trunk/files/0002-OpenCSW-bash-for-tests.patch 2011-08-10 13:37:26 UTC (rev 15300)
@@ -0,0 +1,22 @@
+From 0de11898c1205e814aec09a05fd74e657a4493ad Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 10 Aug 2011 11:40:18 +0200
+Subject: [PATCH] OpenCSW bash for tests
+
+---
+ test/TestRunner.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/TestRunner.sh b/test/TestRunner.sh
+index ab50856..1686f72 100755
+--- a/test/TestRunner.sh
++++ b/test/TestRunner.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ # Deprecated, use 'llvm-lit'.
+
+ echo "warning: '$0' is deprecated, use 'llvm-lit' instead."
+--
+1.7.6
+
Added: csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch
===================================================================
--- csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch (rev 0)
+++ csw/mgar/pkg/llvm/trunk/files/0003-OpenCSW-bash-with-the-Python-test-runner.patch 2011-08-10 13:37:26 UTC (rev 15300)
@@ -0,0 +1,25 @@
+From 3bc149078e3e003d1cb4285903df8c87ec7ea15c Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 10 Aug 2011 11:50:23 +0200
+Subject: [PATCH] OpenCSW bash with the Python test runner
+
+---
+ utils/lit/lit/TestRunner.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py
+index 80d0ba1..9b5ec43 100644
+--- a/utils/lit/lit/TestRunner.py
++++ b/utils/lit/lit/TestRunner.py
+@@ -358,7 +358,7 @@ def executeScript(test, litConfig, tmpBase, commands, cwd):
+ if bashPath:
+ command = [bashPath, script]
+ else:
+- command = ['/bin/sh', script]
++ command = ['/opt/csw/bin/bash', script]
+ if litConfig.useValgrind:
+ # FIXME: Running valgrind on sh is overkill. We probably could just
+ # run on clang with no real loss.
+--
+1.7.6
+
Added: csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch
===================================================================
--- csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch (rev 0)
+++ csw/mgar/pkg/llvm/trunk/files/0004-test-runner-adaptation-to-Solaris.patch 2011-08-10 13:37:26 UTC (rev 15300)
@@ -0,0 +1,41 @@
+From 2f18958deeaf3be901798baea4d01dac8693e42e Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 10 Aug 2011 15:34:29 +0200
+Subject: [PATCH] test runner adaptation to Solaris
+
+---
+ utils/lit/lit/LitConfig.py | 5 ++++-
+ utils/lit/lit/Util.py | 1 +
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/utils/lit/lit/LitConfig.py b/utils/lit/lit/LitConfig.py
+index 7ca1b9c..ad7d761 100644
+--- a/utils/lit/lit/LitConfig.py
++++ b/utils/lit/lit/LitConfig.py
+@@ -74,7 +74,10 @@ class LitConfig:
+ self.bashPath = Util.which('bash', os.pathsep.join(self.path))
+ if self.bashPath is None:
+ # Check some known paths.
+- for path in ('/bin/bash', '/usr/bin/bash', '/usr/local/bin/bash'):
++ for path in ('/opt/csw/bin/bash',
++ '/bin/bash',
++ '/usr/bin/bash',
++ '/usr/local/bin/bash'):
+ if os.path.exists(path):
+ self.bashPath = path
+ break
+diff --git a/utils/lit/lit/Util.py b/utils/lit/lit/Util.py
+index 5635f50..1ac512c 100644
+--- a/utils/lit/lit/Util.py
++++ b/utils/lit/lit/Util.py
+@@ -54,6 +54,7 @@ def which(command, paths = None):
+
+ if paths is None:
+ paths = os.environ.get('PATH','')
++ paths = "/opt/csw/bin:" + paths
+
+ # Check for absolute match first.
+ if os.path.exists(command):
+--
+1.7.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list