From 78072c0c314aa3716d45a51c3180df5a173c5d1a Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 22 Aug 2014 09:02:07 -0700
Subject: [PATCH] add junitgate command; use .so extension for urand always
---
com.oracle.truffle.r.test.native/urand/Makefile | 4 +++-
mx.fastr/mx_fastr.py | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.test.native/urand/Makefile b/com.oracle.truffle.r.test.native/urand/Makefile
index e68fec7923..cec8681d96 100644
--- a/com.oracle.truffle.r.test.native/urand/Makefile
+++ b/com.oracle.truffle.r.test.native/urand/Makefile
@@ -34,7 +34,9 @@ include $(NATIVE_PROJECT)/platform.mk
OBJ = lib
SRC = src
C_SOURCES := $(wildcard $(SRC)/*.c)
-C_LIBNAME := lib$(subst $(SRC)/,,$(C_SOURCES:.c=.$(SHARED_EXT)))
+# Since this library is loaded explicitly we keep a consistent
+# extension so that the test script is portable for TestExpectedOutput
+C_LIBNAME := lib$(subst $(SRC)/,,$(C_SOURCES:.c=.so))
C_OBJECTS := $(subst $(SRC),$(OBJ),$(C_SOURCES:.c=.o))
C_LIB := $(OBJ)/$(C_LIBNAME)
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index e0855a0071..c5a32c8e71 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -243,6 +243,9 @@ def junit_simple(args):
def junit_default(args):
return junit(['--tests', _all_unit_tests()] + args)
+def junit_gate(args):
+ return junit(['--tests', _gate_unit_tests()] + args)
+
def _simple_unit_tests():
return 'com.oracle.truffle.r.test.simple'
@@ -363,6 +366,7 @@ def mx_init(suite):
'junit' : [junit, ['options']],
'junitsimple' : [junit_simple, ['options']],
'junitdefault' : [junit_default, ['options']],
+ 'junitgate' : [junit_gate, ['options']],
'unittest' : [unittest, ['options']],
'rbcheck' : [rbcheck, ['options']],
'rcmplib' : [rcmplib, ['options']],
--
GitLab