From 86e54f8bdabe6bce08ba69d7b6cc076832c2ab9c Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Tue, 5 Aug 2014 20:38:27 -0700
Subject: [PATCH] test.native clean build fix; javadoc TestUserRNG
---
com.oracle.truffle.r.test.native/urand/src/Makefile | 5 ++++-
.../src/com/oracle/truffle/r/test/rffi/TestUserRNG.java | 8 +++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.test.native/urand/src/Makefile b/com.oracle.truffle.r.test.native/urand/src/Makefile
index e78bd38380..cf4d81e20d 100644
--- a/com.oracle.truffle.r.test.native/urand/src/Makefile
+++ b/com.oracle.truffle.r.test.native/urand/src/Makefile
@@ -37,13 +37,16 @@ endif
INCLUDE_DIR := $(subst test.native,native,$(TOPDIR))/include
-all: $(C_OBJECTS)
+all: mkbin $(C_OBJECTS)
ifneq ($(shell uname), Darwin)
gcc -fPIC -shared -o $(C_LIB) $(C_OBJECTS)
else
gcc -dynamiclib -undefined dynamic_lookup -o $(C_LIB) $(C_OBJECTS)
endif
+mkbin:
+ mkdir -p $(BIN)
+
$(BIN)/%.o: %.c
gcc -I$(INCLUDE_DIR) -fPIC -O2 -c $< -o $@
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rffi/TestUserRNG.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rffi/TestUserRNG.java
index e82cd897e9..bca4effc45 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rffi/TestUserRNG.java
+++ b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/rffi/TestUserRNG.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,14 @@ import java.nio.file.*;
import org.junit.*;
import com.oracle.truffle.r.runtime.*;
+import com.oracle.truffle.r.runtime.ffi.*;
import com.oracle.truffle.r.test.*;
+/**
+ * Test for a user-defined random number generator. Implicitly tests {@code dyn.load} as well as the
+ * {@link UserRngRFFI} interface. We take care to use relative paths so the expected output file is
+ * portable.
+ */
public class TestUserRNG extends TestBase {
@Test
public void testUserRNG() {
--
GitLab