Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
c7e52bcd
Commit
c7e52bcd
authored
7 years ago
by
Miloslav Metelka
Browse files
Options
Downloads
Patches
Plain Diff
Added FastR compilation on JDK9 to gate.
parent
7f3ee1dc
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci.hocon
+18
-0
18 additions, 0 deletions
ci.hocon
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_weekdaysDate.java
+7
-1
7 additions, 1 deletion
...cle/truffle/r/test/builtins/TestBuiltin_weekdaysDate.java
with
25 additions
and
1 deletion
ci.hocon
+
18
−
0
View file @
c7e52bcd
...
...
@@ -7,6 +7,7 @@
java7
:
{
name
:
oraclejdk
,
version
:
"7"
,
platformspecific
:
true
}
# java 8 must be a jvmci enabled variant
java8
:
{
name
:
labsjdk
,
version
:
"8-jvmci-latest"
,
platformspecific
:
true
}
java9
:
{
name
:
labsjdk
,
version
:
"9-ea+168"
,
platformspecific
:
true
}
java8Downloads
:
{
downloads
:
{
...
...
@@ -17,6 +18,16 @@ java8Downloads : {
}
}
java9Downloads
:
{
downloads
:
{
EXTRA_JAVA_HOMES
:
{
pathlist
:[
${
java7
}
${
java8
}
]}
JAVA_HOME
:
${
java9
}
}
}
logfiles
:
[
"fastr_errors.log"
"results.json"
...
...
@@ -123,6 +134,12 @@ gateTestManagedLinux: ${common} {
]
}
gateTestJava9Linux :
${
java9Downloads
}
${
gateTestCommon
}
{
downloads : {
JAVA_HOME : ${java9Downloads.downloads.JAVA_HOME}
EXTRA_JAVA_HOMES : ${java9Downloads.downloads.EXTRA_JAVA_HOMES}
}
}
# This performs a number of "
style
" checks on the code to ensure it confirms to the project standards.
...
...
@@ -171,4 +188,5 @@ builds = [
${
rbcheck
}
{capabilities : [linux, amd64], targets : [gate], name: "
gate-rbcheck-linux-amd
64
"}
${
internalPkgtest
}
{capabilities : [linux, amd64], targets : [gate], name: "
gate-internal-pkgtest-linux-amd
64
"}
${
gateTestManagedLinux
}
{capabilities : [linux, amd64, fast], targets : [gate], name: "
gate-test-managed-linux-amd
64
"}
${
gateTestJava9Linux
}
{capabilities : [linux, amd64, fast], targets : [gate], name: "
gate-test-java
9
-linux-amd
64
"}
]
This diff is collapsed.
Click to expand it.
com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/builtins/TestBuiltin_weekdaysDate.java
+
7
−
1
View file @
c7e52bcd
...
...
@@ -4,7 +4,7 @@
* http://www.gnu.org/licenses/gpl-2.0.html
*
* Copyright (c) 2014, Purdue University
* Copyright (c) 2014, 201
6
, Oracle and/or its affiliates
* Copyright (c) 2014, 201
7
, Oracle and/or its affiliates
*
* All rights reserved.
*/
...
...
@@ -13,6 +13,7 @@ package com.oracle.truffle.r.test.builtins;
import
org.junit.Test
;
import
com.oracle.truffle.r.test.TestBase
;
import
java.util.Locale
;
// Checkstyle: stop line length check
...
...
@@ -20,6 +21,11 @@ public class TestBuiltin_weekdaysDate extends TestBase {
@Test
public
void
testweekdaysDate1
()
{
// Explicit locale setting is a workaround to run this test on JDK9.
// Otherwise the test was returning "Thu" instead of "Thursday"
// due to JDK bug 8130845.
Locale
.
setDefault
(
Locale
.
ENGLISH
);
assertEval
(
"argv <- structure(list(x = structure(16352, class = 'Date')), .Names = 'x');do.call('weekdays.Date', argv)"
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment