# HG changeset patch
# User dsamersoff
# Date 1482233567 0
# Node ID 2104a8acb1947c0ffd294ec132e4b42ad4e4fb54
# Parent  bf1ddfe56bad0d7eb978ecf3e094fa0855918e47# Parent  6eeb895b1a6f2ce2ac0bb257e23d4788db320466
Merge

diff -r 6eeb895b1a6f -r 2104a8acb194 hotspot/test/native/logging/test_logStream.cpp
--- a/hotspot/test/native/logging/test_logStream.cpp	Tue Dec 20 10:53:52 2016 +0000
+++ b/hotspot/test/native/logging/test_logStream.cpp	Tue Dec 20 11:32:47 2016 +0000
@@ -41,41 +41,41 @@
   EXPECT_TRUE(file_contains_substring(TestLogFileName, "3 workers\n"));
 }
 
-TEST_F(LogStreamTest, from_log) {
+TEST_VM_F(LogStreamTest, from_log) {
   Log(gc) log;
   LogStream stream(log.debug());
 
   verify_stream(&stream);
 }
 
-TEST_F(LogStreamTest, from_logtarget) {
+TEST_VM_F(LogStreamTest, from_logtarget) {
   LogTarget(Debug, gc) log;
   LogStream stream(log);
 
   verify_stream(&stream);
 }
 
-TEST_F(LogStreamTest, handle) {
+TEST_VM_F(LogStreamTest, handle) {
   LogStreamHandle(Debug, gc) stream;
 
   verify_stream(&stream);
 }
 
-TEST_F(LogStreamTest, no_rm) {
+TEST_VM_F(LogStreamTest, no_rm) {
   ResourceMark rm;
   outputStream* stream = LogTarget(Debug, gc)::stream();
 
   verify_stream(stream);
 }
 
-TEST_F(LogStreamTest, c_heap_stream) {
+TEST_VM_F(LogStreamTest, c_heap_stream) {
   Log(gc) log;
   LogStreamCHeap stream(log.debug());
 
   verify_stream(&stream);
 }
 
-TEST_F(LogStreamTest, c_heap_stream_target) {
+TEST_VM_F(LogStreamTest, c_heap_stream_target) {
   LogTarget(Debug, gc) log;
   LogStreamCHeap stream(log);