aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ext/Makefile2
-rw-r--r--test/framework.py8
2 files changed, 1 insertions, 9 deletions
diff --git a/test/ext/Makefile b/test/ext/Makefile
index 9c9791b1364..bc2061446f4 100644
--- a/test/ext/Makefile
+++ b/test/ext/Makefile
@@ -33,7 +33,7 @@ $(VAPI_CBIN).d: $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h
$(CC) -o $@ $(CFLAGS) -MM -MT '$(VAPI_CBIN)' $(CSRC) > $@
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID) AND $(OS_VERSION_ID),7)
VAPI_CPPBIN=
else
CPPSRC = $(TEST_EXT_DIR)/vapi_cpp_test.cpp
diff --git a/test/framework.py b/test/framework.py
index 970c42de809..f5775134ded 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -219,14 +219,6 @@ def _running_gcov_tests():
running_gcov_tests = _running_gcov_tests()
-def _running_on_centos():
- os_id = os.getenv("OS_ID", "")
- return True if "centos" in os_id.lower() else False
-
-
-running_on_centos = _running_on_centos()
-
-
class KeepAliveReporter(object):
"""
Singleton object which reports test start to parent process