Switch some uses of old command line syntax to new

6 files changed, 13 insertions, 13 deletions

diff --git a/tests/farm/annotate/annotate_dir.py b/tests/farm/annotate/annotate_dir.py
index 3e37f9ed..86c18cab 100644
--- a/tests/farm/annotate/annotate_dir.py
+++ b/tests/farm/annotate/annotate_dir.py
@@ -1,7 +1,7 @@
 copy("src", "run")
 run("""
-    coverage -e -x multi.py
-    coverage -a -d out_anno_dir
+    coverage run multi.py
+    coverage annotate -d out_anno_dir
     """, rundir="run")
 compare("run/out_anno_dir", "gold_anno_dir", "*,cover", left_extra=True)
 clean("run")
diff --git a/tests/farm/annotate/run.py b/tests/farm/annotate/run.py
index c645f21c..236f401f 100644
--- a/tests/farm/annotate/run.py
+++ b/tests/farm/annotate/run.py
@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
-    coverage -e -x white.py
-    coverage -a white.py
+    coverage run white.py
+    coverage annotate white.py
     """, rundir="out")
 compare("out", "gold", "*,cover")
 clean("out")
diff --git a/tests/farm/annotate/run_multi.py b/tests/farm/annotate/run_multi.py
index 4e8252ed..ef1e8238 100644
--- a/tests/farm/annotate/run_multi.py
+++ b/tests/farm/annotate/run_multi.py
@@ -1,7 +1,7 @@
 copy("src", "out_multi")
 run("""
-    coverage -e -x multi.py
-    coverage -a
+    coverage run multi.py
+    coverage annotate
     """, rundir="out_multi")
 compare("out_multi", "gold_multi", "*,cover")
 clean("out_multi")
diff --git a/tests/farm/run/run_chdir.py b/tests/farm/run/run_chdir.py
index f459f500..367cd0ad 100644
--- a/tests/farm/run/run_chdir.py
+++ b/tests/farm/run/run_chdir.py
@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
     coverage run chdir.py
-    coverage -r
+    coverage report
     """, rundir="out", outfile="stdout.txt")
 contains("out/stdout.txt",
         "Line One",
diff --git a/tests/farm/run/run_timid.py b/tests/farm/run/run_timid.py
index ce78fff1..d4e69a46 100644
--- a/tests/farm/run/run_timid.py
+++ b/tests/farm/run/run_timid.py
@@ -17,8 +17,8 @@ if os.environ.get('COVERAGE_COVERAGE', ''):
 copy("src", "out")
 run("""
     python showtrace.py none
-    coverage -e -x showtrace.py regular
-    coverage -e -x --timid showtrace.py timid
+    coverage run showtrace.py regular
+    coverage run --timid showtrace.py timid
     """, rundir="out", outfile="showtraceout.txt")
 
 # When running without coverage, no trace function
@@ -42,8 +42,8 @@ old_opts = os.environ.get('COVERAGE_OPTIONS')
 os.environ['COVERAGE_OPTIONS'] = '--timid'
 
 run("""
-    coverage -e -x showtrace.py regular
-    coverage -e -x --timid showtrace.py timid
+    coverage run showtrace.py regular
+    coverage run --timid showtrace.py timid
     """, rundir="out", outfile="showtraceout.txt")
 
 contains("out/showtraceout.txt",
diff --git a/tests/farm/run/run_xxx.py b/tests/farm/run/run_xxx.py
index 19e94a42..6fedc934 100644
--- a/tests/farm/run/run_xxx.py
+++ b/tests/farm/run/run_xxx.py
@@ -1,7 +1,7 @@
 copy("src", "out")
 run("""
-    coverage -e -x xxx
-    coverage -r
+    coverage run xxx
+    coverage report
     """, rundir="out", outfile="stdout.txt")
 contains("out/stdout.txt",
         "xxx: 3 4 0 7",