Package: pmccabe / 2.8-2

0001-Don-t-put-binary-path-into-.ref-files-to-allow-testi.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
From 4c3263478c5339b2a0581685e75cc988817f4137 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 22 Jan 2021 16:34:07 +0100
Subject: [PATCH 1/3] Don't put binary path into .ref files to allow testing of
 /usr/bin/pmccabe.

---
 tests/test000.ref           | 6 +++---
 tests/test001.ref           | 6 +++---
 tests/test002.ref           | 6 +++---
 tests/test003.ref           | 6 +++---
 tests/test004.ref           | 6 +++---
 tests/test005.ref           | 6 +++---
 tests/test006/Grapher.H.ref | 6 +++---
 tests/test006/Handler.H.ref | 6 +++---
 tests/test006/NodeArc.H.ref | 6 +++---
 tests/test007.ref           | 6 +++---
 tests/test008.ref           | 6 +++---
 tests/test009.ref           | 6 +++---
 tests/test010.ref           | 6 +++---
 tests/test011.ref           | 6 +++---
 tests/test012.ref           | 6 +++---
 tests/test013.ref           | 6 +++---
 tests/test014.ref           | 6 +++---
 tests/test015.ref           | 6 +++---
 tests/test016.ref           | 6 +++---
 tests/test017.ref           | 6 +++---
 tests/test018.ref           | 6 +++---
 tests/test019.ref           | 6 +++---
 tests/test020.ref           | 6 +++---
 tests/test021.ref           | 6 +++---
 tests/test022.ref           | 6 +++---
 tests/test023.ref           | 6 +++---
 tests/test024.ref           | 6 +++---
 tests/test025.ref           | 6 +++---
 tests/test026.ref           | 6 +++---
 tests/test027.ref           | 6 +++---
 tests/testlist.ref          | 6 +++---
 tests/testsuite             | 2 +-
 32 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/tests/test000.ref b/tests/test000.ref
index 584fb5c..2de9e9d 100644
--- a/tests/test000.ref
+++ b/tests/test000.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test000
+RUN: pmccabe -X -vt test000
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -12,11 +12,11 @@ Modified McCabe Cyclomatic Complexity
 4	8	18	24	35	test000(24): Add::eval
 1	1	1	60	4	test000(60): Add::modified_attributes
 8	12	30	n/a	64	Total
-RUN: ../pmccabe -X -vnt test000
+RUN: pmccabe -X -vnt test000
    CSL PCT  NCSL PCT  TOTAL  FILENAME
     10  16    54  84     64  test000
     10  16    54  84     64  (total files: 1)
-RUN: ../pmccabe -x -vt test000
+RUN: pmccabe -x -vt test000
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test001.ref b/tests/test001.ref
index 1997443..8d71a59 100644
--- a/tests/test001.ref
+++ b/tests/test001.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test001
+RUN: pmccabe -X -vt test001
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -16,11 +16,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	0	32	1	test001(32): unnamed::member_function
 1	1	0	35	3	test001(36): xyzzy::operator+=
 9	9	12	n/a	37	Total
-RUN: ../pmccabe -X -vnt test001
+RUN: pmccabe -X -vnt test001
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      9  24    28  76     37  test001
      9  24    28  76     37  (total files: 1)
-RUN: ../pmccabe -x -vt test001
+RUN: pmccabe -x -vt test001
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test002.ref b/tests/test002.ref
index 55079d8..2fc9768 100644
--- a/tests/test002.ref
+++ b/tests/test002.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test002
+RUN: pmccabe -X -vt test002
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -10,11 +10,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	3	1	test002(3): class1::class2::operator+=
 1	1	1	5	1	test002(5): class4::operator+=
 3	3	6	n/a	5	Total
-RUN: ../pmccabe -X -vnt test002
+RUN: pmccabe -X -vnt test002
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      2  40     3  60      5  test002
      2  40     3  60      5  (total files: 1)
-RUN: ../pmccabe -x -vt test002
+RUN: pmccabe -x -vt test002
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test003.ref b/tests/test003.ref
index 2d2ae22..9c7dfd9 100644
--- a/tests/test003.ref
+++ b/tests/test003.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test003
+RUN: pmccabe -X -vt test003
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -10,11 +10,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	15	4	test003(15): T1::operator_long()
 1	1	1	20	4	test003(20): T2::operator_long()
 3	3	7	n/a	24	Total
-RUN: ../pmccabe -X -vnt test003
+RUN: pmccabe -X -vnt test003
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      6  25    18  75     24  test003
      6  25    18  75     24  (total files: 1)
-RUN: ../pmccabe -x -vt test003
+RUN: pmccabe -x -vt test003
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test004.ref b/tests/test004.ref
index 39fdf7f..6acd8e6 100644
--- a/tests/test004.ref
+++ b/tests/test004.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test004
+RUN: pmccabe -X -vt test004
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -9,11 +9,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	8	4	test004(8): T1::unnamed::member
 1	1	1	17	4	test004(17): T1::T11::T12::member
 2	2	0	n/a	23	Total
-RUN: ../pmccabe -X -vnt test004
+RUN: pmccabe -X -vnt test004
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1   4    22  96     23  test004
      1   4    22  96     23  (total files: 1)
-RUN: ../pmccabe -x -vt test004
+RUN: pmccabe -x -vt test004
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test005.ref b/tests/test005.ref
index 04ce7e5..3f9bc6f 100644
--- a/tests/test005.ref
+++ b/tests/test005.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test005
+RUN: pmccabe -X -vt test005
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -24,11 +24,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	58	1	test005(58): TypedValue::Assign
 2	2	3	63	4	test005(65): TypedValue::print_type
 20	20	31	n/a	103	Total
-RUN: ../pmccabe -X -vnt test005
+RUN: pmccabe -X -vnt test005
    CSL PCT  NCSL PCT  TOTAL  FILENAME
     32  31    71  69    103  test005
     32  31    71  69    103  (total files: 1)
-RUN: ../pmccabe -x -vt test005
+RUN: pmccabe -x -vt test005
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test006/Grapher.H.ref b/tests/test006/Grapher.H.ref
index db6a38d..2af9caf 100644
--- a/tests/test006/Grapher.H.ref
+++ b/tests/test006/Grapher.H.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test006/Grapher.H
+RUN: pmccabe -X -vt test006/Grapher.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -10,11 +10,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	0	27	1	test006/Grapher.H(27): Grapher::~Grapher
 1	1	1	29	1	test006/Grapher.H(29): Grapher::xegraph
 3	3	5	n/a	32	Total
-RUN: ../pmccabe -X -vnt test006/Grapher.H
+RUN: pmccabe -X -vnt test006/Grapher.H
    CSL PCT  NCSL PCT  TOTAL  FILENAME
     11  34    21  66     32  test006/Grapher.H
     11  34    21  66     32  (total files: 1)
-RUN: ../pmccabe -x -vt test006/Grapher.H
+RUN: pmccabe -x -vt test006/Grapher.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test006/Handler.H.ref b/tests/test006/Handler.H.ref
index b4201a1..acd2bd9 100644
--- a/tests/test006/Handler.H.ref
+++ b/tests/test006/Handler.H.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test006/Handler.H
+RUN: pmccabe -X -vt test006/Handler.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -85,11 +85,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	746	4	test006/Handler.H(746): SelectionMover::SelectionMover
 1	1	1	758	4	test006/Handler.H(758): MenuHandler::MenuHandler
 122	122	245	n/a	770	Total
-RUN: ../pmccabe -X -vnt test006/Handler.H
+RUN: pmccabe -X -vnt test006/Handler.H
    CSL PCT  NCSL PCT  TOTAL  FILENAME
    152  20   618  80    770  test006/Handler.H
    152  20   618  80    770  (total files: 1)
-RUN: ../pmccabe -x -vt test006/Handler.H
+RUN: pmccabe -x -vt test006/Handler.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test006/NodeArc.H.ref b/tests/test006/NodeArc.H.ref
index 816492c..9a712eb 100644
--- a/tests/test006/NodeArc.H.ref
+++ b/tests/test006/NodeArc.H.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test006/NodeArc.H
+RUN: pmccabe -X -vt test006/NodeArc.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -40,11 +40,11 @@ Modified McCabe Cyclomatic Complexity
 5	5	15	485	36	test006/NodeArc.H(485): RankedArc::drawArrow
 2	2	3	526	7	test006/NodeArc.H(526): RankedArc::~RankedArc
 71	71	181	n/a	539	Total
-RUN: ../pmccabe -X -vnt test006/NodeArc.H
+RUN: pmccabe -X -vnt test006/NodeArc.H
    CSL PCT  NCSL PCT  TOTAL  FILENAME
    161  30   378  70    539  test006/NodeArc.H
    161  30   378  70    539  (total files: 1)
-RUN: ../pmccabe -x -vt test006/NodeArc.H
+RUN: pmccabe -x -vt test006/NodeArc.H
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test007.ref b/tests/test007.ref
index 7e89d65..3fd6de8 100644
--- a/tests/test007.ref
+++ b/tests/test007.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test007
+RUN: pmccabe -X -vt test007
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -11,11 +11,11 @@ Modified McCabe Cyclomatic Complexity
 5	5	10	17	8	test007(17): a
 5	5	10	25	8	test007(25): a
 20	20	44	n/a	32	Total
-RUN: ../pmccabe -X -vnt test007
+RUN: pmccabe -X -vnt test007
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      0   0    32 100     32  test007
      0   0    32 100     32  (total files: 1)
-RUN: ../pmccabe -x -vt test007
+RUN: pmccabe -x -vt test007
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test008.ref b/tests/test008.ref
index 67c3bf7..780219d 100644
--- a/tests/test008.ref
+++ b/tests/test008.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test008
+RUN: pmccabe -X -vt test008
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -9,11 +9,11 @@ Modified McCabe Cyclomatic Complexity
 3	3	2	2	7	test008(2): fn1
 2	2	2	10	7	test008(10): fn2
 5	5	6	n/a	16	Total
-RUN: ../pmccabe -X -vnt test008
+RUN: pmccabe -X -vnt test008
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      2  12    14  88     16  test008
      2  12    14  88     16  (total files: 1)
-RUN: ../pmccabe -x -vt test008
+RUN: pmccabe -x -vt test008
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test009.ref b/tests/test009.ref
index 50252a4..8755242 100644
--- a/tests/test009.ref
+++ b/tests/test009.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test009
+RUN: pmccabe -X -vt test009
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -10,11 +10,11 @@ Modified McCabe Cyclomatic Complexity
 2	2	4	9	10	test009(9): function1/class1::amember
 1	1	2	4	20	test009(5): function1
 4	4	9	n/a	23	Total
-RUN: ../pmccabe -X -vnt test009
+RUN: pmccabe -X -vnt test009
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      3  13    20  87     23  test009
      3  13    20  87     23  (total files: 1)
-RUN: ../pmccabe -x -vt test009
+RUN: pmccabe -x -vt test009
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test010.ref b/tests/test010.ref
index f2ce127..042b519 100644
--- a/tests/test010.ref
+++ b/tests/test010.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test010
+RUN: pmccabe -X -vt test010
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	7	Total
-RUN: ../pmccabe -X -vnt test010
+RUN: pmccabe -X -vnt test010
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1  14     6  86      7  test010
      1  14     6  86      7  (total files: 1)
-RUN: ../pmccabe -x -vt test010
+RUN: pmccabe -x -vt test010
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test011.ref b/tests/test011.ref
index 10761a4..3ad1a62 100644
--- a/tests/test011.ref
+++ b/tests/test011.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test011
+RUN: pmccabe -X -vt test011
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -10,11 +10,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	8	5	test011(9): function2
 1	1	1	14	5	test011(15): function3
 3	3	6	n/a	18	Total
-RUN: ../pmccabe -X -vnt test011
+RUN: pmccabe -X -vnt test011
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      3  17    15  83     18  test011
      3  17    15  83     18  (total files: 1)
-RUN: ../pmccabe -x -vt test011
+RUN: pmccabe -x -vt test011
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test012.ref b/tests/test012.ref
index a767446..06f87e5 100644
--- a/tests/test012.ref
+++ b/tests/test012.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test012
+RUN: pmccabe -X -vt test012
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	1	Total
-RUN: ../pmccabe -X -vnt test012
+RUN: pmccabe -X -vnt test012
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      0   0     1 100      1  test012
      0   0     1 100      1  (total files: 1)
-RUN: ../pmccabe -x -vt test012
+RUN: pmccabe -x -vt test012
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test013.ref b/tests/test013.ref
index 14c2fce..58a3db8 100644
--- a/tests/test013.ref
+++ b/tests/test013.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test013
+RUN: pmccabe -X -vt test013
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -8,11 +8,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |           |
 1	1	2	1	6	test013(1): foo
 1	1	3	n/a	6	Total
-RUN: ../pmccabe -X -vnt test013
+RUN: pmccabe -X -vnt test013
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      0   0     6 100      6  test013
      0   0     6 100      6  (total files: 1)
-RUN: ../pmccabe -x -vt test013
+RUN: pmccabe -x -vt test013
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test014.ref b/tests/test014.ref
index f811469..058010f 100644
--- a/tests/test014.ref
+++ b/tests/test014.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test014
+RUN: pmccabe -X -vt test014
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -8,11 +8,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |           |
 2	2	1	2	6	test014(3): main
 2	2	2	n/a	7	Total
-RUN: ../pmccabe -X -vnt test014
+RUN: pmccabe -X -vnt test014
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1  14     6  86      7  test014
      1  14     6  86      7  (total files: 1)
-RUN: ../pmccabe -x -vt test014
+RUN: pmccabe -x -vt test014
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test015.ref b/tests/test015.ref
index 78326f3..20f7e5d 100644
--- a/tests/test015.ref
+++ b/tests/test015.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test015
+RUN: pmccabe -X -vt test015
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -15,11 +15,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	0	32	1	test015(32): bar::bar
 1	1	0	36	1	test015(36): anonymous_namespace::bar::bar
 12	12	8	n/a	40	Total
-RUN: ../pmccabe -X -vnt test015
+RUN: pmccabe -X -vnt test015
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      5  12    35  88     40  test015
      5  12    35  88     40  (total files: 1)
-RUN: ../pmccabe -x -vt test015
+RUN: pmccabe -x -vt test015
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test016.ref b/tests/test016.ref
index df1ce9a..7f6e7f1 100644
--- a/tests/test016.ref
+++ b/tests/test016.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test016
+RUN: pmccabe -X -vt test016
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -9,11 +9,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	1	5	1	test016(5): Foo::Foo
 1	1	1	10	1	test016(10): Foo::after_potential_parsing_hang
 2	2	3	n/a	12	Total
-RUN: ../pmccabe -X -vnt test016
+RUN: pmccabe -X -vnt test016
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      4  33     8  67     12  test016
      4  33     8  67     12  (total files: 1)
-RUN: ../pmccabe -x -vt test016
+RUN: pmccabe -x -vt test016
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test017.ref b/tests/test017.ref
index fa73184..2a8467e 100644
--- a/tests/test017.ref
+++ b/tests/test017.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test017
+RUN: pmccabe -X -vt test017
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	8	Total
-RUN: ../pmccabe -X -vnt test017
+RUN: pmccabe -X -vnt test017
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1  12     7  88      8  test017
      1  12     7  88      8  (total files: 1)
-RUN: ../pmccabe -x -vt test017
+RUN: pmccabe -x -vt test017
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test018.ref b/tests/test018.ref
index f4c99fe..8cb25a2 100644
--- a/tests/test018.ref
+++ b/tests/test018.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test018
+RUN: pmccabe -X -vt test018
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -8,11 +8,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |           |
 1	1	0	5	1	test018(5): foo
 1	1	1	n/a	5	Total
-RUN: ../pmccabe -X -vnt test018
+RUN: pmccabe -X -vnt test018
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      2  40     3  60      5  test018
      2  40     3  60      5  (total files: 1)
-RUN: ../pmccabe -x -vt test018
+RUN: pmccabe -x -vt test018
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test019.ref b/tests/test019.ref
index 37e5f5f..d5606da 100644
--- a/tests/test019.ref
+++ b/tests/test019.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test019
+RUN: pmccabe -X -vt test019
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	23	Total
-RUN: ../pmccabe -X -vnt test019
+RUN: pmccabe -X -vnt test019
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      4  17    19  83     23  test019
      4  17    19  83     23  (total files: 1)
-RUN: ../pmccabe -x -vt test019
+RUN: pmccabe -x -vt test019
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test020.ref b/tests/test020.ref
index 5fe7d0e..bb8bc95 100644
--- a/tests/test020.ref
+++ b/tests/test020.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test020
+RUN: pmccabe -X -vt test020
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	21	Total
-RUN: ../pmccabe -X -vnt test020
+RUN: pmccabe -X -vnt test020
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      0   0    21 100     21  test020
      0   0    21 100     21  (total files: 1)
-RUN: ../pmccabe -x -vt test020
+RUN: pmccabe -x -vt test020
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test021.ref b/tests/test021.ref
index 0aac88d..0d0e451 100644
--- a/tests/test021.ref
+++ b/tests/test021.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test021
+RUN: pmccabe -X -vt test021
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -8,11 +8,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |           |
 4	4	4	14	24	test021(14): total_lack_of_modularity
 4	4	5	n/a	41	Total
-RUN: ../pmccabe -X -vnt test021
+RUN: pmccabe -X -vnt test021
    CSL PCT  NCSL PCT  TOTAL  FILENAME
     12  29    29  71     41  test021
     12  29    29  71     41  (total files: 1)
-RUN: ../pmccabe -x -vt test021
+RUN: pmccabe -x -vt test021
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test022.ref b/tests/test022.ref
index 7b72034..3022621 100644
--- a/tests/test022.ref
+++ b/tests/test022.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test022
+RUN: pmccabe -X -vt test022
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	0	n/a	6	Total
-RUN: ../pmccabe -X -vnt test022
+RUN: pmccabe -X -vnt test022
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1  17     5  83      6  test022
      1  17     5  83      6  (total files: 1)
-RUN: ../pmccabe -x -vt test022
+RUN: pmccabe -x -vt test022
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test023.ref b/tests/test023.ref
index d18b77b..8e7858f 100644
--- a/tests/test023.ref
+++ b/tests/test023.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test023
+RUN: pmccabe -X -vt test023
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	0	n/a	10	Total
-RUN: ../pmccabe -X -vnt test023
+RUN: pmccabe -X -vnt test023
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      5  50     5  50     10  test023
      5  50     5  50     10  (total files: 1)
-RUN: ../pmccabe -x -vt test023
+RUN: pmccabe -x -vt test023
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test024.ref b/tests/test024.ref
index 44517aa..bbcbb74 100644
--- a/tests/test024.ref
+++ b/tests/test024.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test024
+RUN: pmccabe -X -vt test024
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -8,11 +8,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |           |
 1	1	0	3	11	test024(3): RescaleBlock_5x1555_To_4x1555
 1	1	1	n/a	13	Total
-RUN: ../pmccabe -X -vnt test024
+RUN: pmccabe -X -vnt test024
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      8  62     5  38     13  test024
      8  62     5  38     13  (total files: 1)
-RUN: ../pmccabe -x -vt test024
+RUN: pmccabe -x -vt test024
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test025.ref b/tests/test025.ref
index 3342382..2233a30 100644
--- a/tests/test025.ref
+++ b/tests/test025.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test025
+RUN: pmccabe -X -vt test025
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -7,11 +7,11 @@ Modified McCabe Cyclomatic Complexity
 |       |        |       |       |  filename(definition line number):function
 |       |        |       |       |           |
 0	0	1	n/a	49	Total
-RUN: ../pmccabe -X -vnt test025
+RUN: pmccabe -X -vnt test025
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      3   6    46  94     49  test025
      3   6    46  94     49  (total files: 1)
-RUN: ../pmccabe -x -vt test025
+RUN: pmccabe -x -vt test025
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test026.ref b/tests/test026.ref
index 2d485b4..19091df 100644
--- a/tests/test026.ref
+++ b/tests/test026.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test026
+RUN: pmccabe -X -vt test026
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -23,11 +23,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	5	355	8	test026(355): TinselMetaEngine::removeSaveState
 4	4	14	372	42	test026(372): Tinsel::TinselEngine::loadGameState
 61	61	182	n/a	425	Total
-RUN: ../pmccabe -X -vnt test026
+RUN: pmccabe -X -vnt test026
    CSL PCT  NCSL PCT  TOTAL  FILENAME
    155  36   270  64    425  test026
    155  36   270  64    425  (total files: 1)
-RUN: ../pmccabe -x -vt test026
+RUN: pmccabe -x -vt test026
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/test027.ref b/tests/test027.ref
index 61ee7ce..03daf33 100644
--- a/tests/test027.ref
+++ b/tests/test027.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test027
+RUN: pmccabe -X -vt test027
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -9,11 +9,11 @@ Modified McCabe Cyclomatic Complexity
 1	1	0	7	1	test027(7): Foo::Bar::Bar
 1	1	0	8	1	test027(8): Foo::Bar::~Bar
 2	2	0	n/a	15	Total
-RUN: ../pmccabe -X -vnt test027
+RUN: pmccabe -X -vnt test027
    CSL PCT  NCSL PCT  TOTAL  FILENAME
      1   7    14  93     15  test027
      1   7    14  93     15  (total files: 1)
-RUN: ../pmccabe -x -vt test027
+RUN: pmccabe -x -vt test027
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/testlist.ref b/tests/testlist.ref
index 026f914..77c3e3c 100644
--- a/tests/testlist.ref
+++ b/tests/testlist.ref
@@ -1,4 +1,4 @@
-RUN: ../pmccabe -X -vt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
+RUN: pmccabe -X -vt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
@@ -205,7 +205,7 @@ Modified McCabe Cyclomatic Complexity
 1	1	0	7	1	test027(7): Foo::Bar::Bar
 1	1	0	8	1	test027(8): Foo::Bar::~Bar
 359	363	793	n/a	2375	Total
-RUN: ../pmccabe -X -vnt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
+RUN: pmccabe -X -vnt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
    CSL PCT  NCSL PCT  TOTAL  FILENAME
     10  16    54  84     64  test000
      9  24    28  76     37  test001
@@ -238,7 +238,7 @@ RUN: ../pmccabe -X -vnt test000 test001 test002 test003 test004 test005 test006/
    155  36   270  64    425  test026
      1   7    14  93     15  test027
    595  25  1780  75   2375  (total files: 30)
-RUN: ../pmccabe -x -vt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
+RUN: pmccabe -x -vt test000 test001 test002 test003 test004 test005 test006/Grapher.H test006/Handler.H test006/NodeArc.H test007 test008 test009 test010 test011 test012 test013 test014 test015 test016 test017 test018 test019 test020 test021 test022 test023 test024 test025 test026 test027
 Modified McCabe Cyclomatic Complexity
 |   Traditional McCabe Cyclomatic Complexity
 |       |    # Statements in function
diff --git a/tests/testsuite b/tests/testsuite
index 71a0f17..8c7aa5f 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -40,7 +40,7 @@ error=0
 # save stderr separately to prevent buffering/interlace ordering problems
 run_pmccabe()
 {
-    echo "RUN: $PMCCABE $@"
+    echo "RUN: pmccabe $@"
     $PMCCABE "$@" 2>.tmp
     cat .tmp
     rm .tmp