# HG changeset patch
# User kzhaldyb
# Date 1482230005 -3600
# Node ID bf1ddfe56bad0d7eb978ecf3e094fa0855918e47
# Parent  9d8028808e7875ecd18f0ffb472d6a914aa87917# Parent  f811d42ba85b2bc90df20c413251b896bfacfa09
Merge

diff -r 9d8028808e78 -r bf1ddfe56bad hotspot/test/native/logging/test_logStream.cpp
--- a/hotspot/test/native/logging/test_logStream.cpp	Thu Dec 01 11:30:22 2016 +0100
+++ b/hotspot/test/native/logging/test_logStream.cpp	Tue Dec 20 11:33:25 2016 +0100
@@ -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);