aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-04-19 23:25:40 +0200
committerGitHub <noreply@github.com>2020-04-19 23:25:40 +0200
commit5b8a4a87aa352149d6f19253769adf32d40248d5 (patch)
tree1a96c9789b2ba0e1a2eb4967158abbb80dca2279
parent7b20fc61bb697779b9c8ee6faf2cacc3710dc387 (diff)
parentd8065a142d21037b1d38f22562117d91ae59d4c8 (diff)
Merge pull request #12979 from vespa-engine/toregge/proc-stat-is-linux-specific
/proc/stat is linux specific.
-rw-r--r--vespalib/src/tests/stllike/asciistream_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/vespalib/src/tests/stllike/asciistream_test.cpp b/vespalib/src/tests/stllike/asciistream_test.cpp
index fd362d9c49a..c9435edea45 100644
--- a/vespalib/src/tests/stllike/asciistream_test.cpp
+++ b/vespalib/src/tests/stllike/asciistream_test.cpp
@@ -387,8 +387,10 @@ AsciistreamTest::testCreateFromFile()
EXPECT_EQUAL("", s);
EXPECT_TRUE(is.eof());
+#ifdef __linux__
is = asciistream::createFromDevice("/proc/stat");
EXPECT_FALSE(is.eof());
+#endif
}
void