From fe221616fcc9269fc39859177b36339157f4ec07 Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Sat, 14 Mar 2015 21:14:57 +1100 Subject: [PATCH] Remove the unnecessary stdpmid includes This will allow the dbpmda-based functional tests to pass even when pmcd has never run, and so the stdpmid file has not yet been generated (ie on a fresh clean build machine). --- include/pcp-cpp/pmda.hpp | 1 - test/functional/test_simple_export_root.expected | 2 -- test/functional/test_simplecpu_export_root.expected | 2 -- test/functional/test_trivial_export_root.expected | 2 -- 4 files changed, 7 deletions(-) diff --git a/include/pcp-cpp/pmda.hpp b/include/pcp-cpp/pmda.hpp index b0c46a4..7446daf 100644 --- a/include/pcp-cpp/pmda.hpp +++ b/include/pcp-cpp/pmda.hpp @@ -1449,7 +1449,6 @@ class pmda { std::ostream &stream = (filename == "-") ? std::cout : file_stream; stream << std::endl - << "#include " << std::endl << std::endl << "root { " << get_pmda_name() << " }" << std::endl << std::endl << "#include \"pmns\"" << std::endl << std::endl; } diff --git a/test/functional/test_simple_export_root.expected b/test/functional/test_simple_export_root.expected index 7973551..ce7145d 100644 --- a/test/functional/test_simple_export_root.expected +++ b/test/functional/test_simple_export_root.expected @@ -1,6 +1,4 @@ -#include - root { simple } #include "pmns" diff --git a/test/functional/test_simplecpu_export_root.expected b/test/functional/test_simplecpu_export_root.expected index 963280f..75455e4 100644 --- a/test/functional/test_simplecpu_export_root.expected +++ b/test/functional/test_simplecpu_export_root.expected @@ -1,6 +1,4 @@ -#include - root { simplecpu } #include "pmns" diff --git a/test/functional/test_trivial_export_root.expected b/test/functional/test_trivial_export_root.expected index 4d6d7cd..4ad1810 100644 --- a/test/functional/test_trivial_export_root.expected +++ b/test/functional/test_trivial_export_root.expected @@ -1,6 +1,4 @@ -#include - root { trivial } #include "pmns"