Simplify configuration for C code coverage

encukou · encukou · commit c5eaa1f92c79 · 2017-11-25T15:40:09.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,13 @@
 language: python
 
+python:
+- '2.7'
+- '3.3'
+- '3.4'
+- '3.5'
+- '3.6'
+# Note: when updating Python versions, also change setup.py and tox.ini
+
 sudo: false
 
 cache: pip
@@ -10,28 +18,8 @@ addons:
       - ldap-utils
       - slapd
 
-matrix:
-  include:
-    - python: 2.7
-      env:
-        - TOXENV=py27
-        - WITH_GCOV=1
-    - python: 3.3
-      env:
-        - TOXENV=py33
-        - WITH_GCOV=1
-    - python: 3.4
-      env:
-        - TOXENV=py34
-        - WITH_GCOV=1
-    - python: 3.5
-      env:
-        - TOXENV=py35
-        - WITH_GCOV=1
-    - python: 3.6
-      env:
-        - TOXENV=py36
-        - WITH_GCOV=1
+env:
+  - WITH_GCOV=1
 
 install:
   - pip install "pip>=7.1.0"
diff --git a/setup.py b/setup.py
@@ -56,6 +56,7 @@ class OpenLDAP2:
   LDAP_CLASS.extra_files[i]=(destdir, origfileslist)
 
 if os.environ.get('WITH_GCOV'):
+  # Insrumentation for measuring code coverage
   LDAP_CLASS.extra_compile_args.extend(
     ['-O0', '-pg', '-fprofile-arcs', '-ftest-coverage']
   )

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class OpenLDAP2:`
`56`	`56`	`LDAP_CLASS.extra_files[i]=(destdir, origfileslist)`
`57`	`57`
`58`	`58`	`if os.environ.get('WITH_GCOV'):`
	`59`	`+ # Insrumentation for measuring code coverage`
`59`	`60`	`LDAP_CLASS.extra_compile_args.extend(`
`60`	`61`	`['-O0', '-pg', '-fprofile-arcs', '-ftest-coverage']`
`61`	`62`	`)`