Skip to content

Commit c03ae38

Browse files
committed
new pip version, some bug fixed on using current dir and showing mutants that append code
1 parent 9bb9a1a commit c03ae38

8 files changed

Lines changed: 26 additions & 12 deletions

File tree

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setup(
77
name='universalmutator',
8-
version='1.0',
8+
version='1.0.1',
99
description='Universal regexp-based mutation tool',
1010
long_description_content_type="text/markdown",
1111
long_description=open('README.md').read(),

universalmutator/analyze.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def main():
9797
with open(fromFile, 'r') as file:
9898
onlyMutants = file.read().split()
9999

100-
mdir = ""
100+
mdir = "."
101101
try:
102102
mdirpos = args.index("--mutantDir")
103103
except ValueError:
@@ -107,6 +107,7 @@ def main():
107107
mdir = args[mdirpos + 1]
108108
args.remove("--mutantDir")
109109
args.remove(mdir)
110+
if mdir[-1] != "/":
110111
mdir += "/"
111112

112113
src = args[1]

universalmutator/checkcov.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def main():
1717
print(" --tstl: process <coverfile> that is output from TSTL internal report")
1818
sys.exit(0)
1919

20-
mdir = ""
20+
mdir = "."
2121
try:
2222
mdirpos = args.index("--mutantDir")
2323
except ValueError:
@@ -27,6 +27,7 @@ def main():
2727
mdir = args[mdirpos + 1]
2828
args.remove("--mutantDir")
2929
args.remove(mdir)
30+
if mdir[-1] != "/":
3031
mdir += "/"
3132

3233
src = args[1]

universalmutator/genmutants.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def main():
197197
for line in d:
198198
lines.append(int(line))
199199

200-
mdir = ""
200+
mdir = "."
201201
try:
202202
mdirpos = args.index("--mutantDir")
203203
except ValueError:
@@ -207,6 +207,7 @@ def main():
207207
mdir = args[mdirpos + 1]
208208
args.remove("--mutantDir")
209209
args.remove(mdir)
210+
if mdir[-1] != "/":
210211
mdir += "/"
211212

212213
ignoreFile = None

universalmutator/prioritize.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def main():
3636
args.remove("--noSDPriority")
3737
noSDPriority = True
3838

39-
mdir = ""
39+
mdir = "."
4040
try:
4141
mdirpos = args.index("--mutantDir")
4242
except ValueError:
@@ -46,9 +46,10 @@ def main():
4646
mdir = args[mdirpos + 1]
4747
args.remove("--mutantDir")
4848
args.remove(mdir)
49+
if mdir[-1] != "/":
4950
mdir += "/"
5051

51-
sdir = ""
52+
sdir = "."
5253
try:
5354
sdirpos = args.index("--sourceDir")
5455
except ValueError:
@@ -58,6 +59,7 @@ def main():
5859
sdir = args[sdirpos + 1]
5960
args.remove("--sourceDir")
6061
args.remove(sdir)
62+
if sdir[-1] != "/":
6163
sdir += "/"
6264

6365
cutoff = 0.0

universalmutator/prune.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def main():
2121
outfile = sys.argv[2]
2222
config = sys.argv[3]
2323

24-
mdir = ""
24+
mdir = "."
2525
try:
2626
mdirpos = args.index("--mutantDir")
2727
except ValueError:
@@ -31,9 +31,10 @@ def main():
3131
mdir = args[mdirpos + 1]
3232
args.remove("--mutantDir")
3333
args.remove(mdir)
34+
if mdir[-1] != "/":
3435
mdir += "/"
3536

36-
sdir = ""
37+
sdir = "."
3738
try:
3839
sdirpos = args.index("--sourceDir")
3940
except ValueError:
@@ -43,6 +44,7 @@ def main():
4344
sdir = args[sdirpos + 1]
4445
args.remove("--sourceDir")
4546
args.remove(sdir)
47+
if sdir[-1] != "/":
4648
sdir += "/"
4749

4850
mutants = []

universalmutator/show.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def main():
1818

1919
infile = sys.argv[1]
2020

21-
mdir = ""
21+
mdir = "."
2222
try:
2323
mdirpos = args.index("--mutantDir")
2424
except ValueError:
@@ -28,9 +28,10 @@ def main():
2828
mdir = args[mdirpos + 1]
2929
args.remove("--mutantDir")
3030
args.remove(mdir)
31+
if mdir[-1] != "/":
3132
mdir += "/"
32-
33-
sdir = ""
33+
34+
sdir = "."
3435
try:
3536
sdirpos = args.index("--sourceDir")
3637
except ValueError:
@@ -40,6 +41,7 @@ def main():
4041
sdir = args[sdirpos + 1]
4142
args.remove("--sourceDir")
4243
args.remove(sdir)
44+
if sdir[-1] != "/":
4345
sdir += "/"
4446

4547
mutants = []

universalmutator/utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,5 +190,10 @@ def readMutant(mutant, source, mutantDir=None):
190190
diffFound = True
191191
break
192192
pos += 1
193+
mpos = pos
194+
if not diffFound:
195+
if len(mcode) > len(scode):
196+
pos = len(scode)-1
197+
diffFound = True
193198
assert diffFound, "mutant " + mfile + " and source " + source + " are identical!"
194-
return (mutant, source, pos, scode[pos], mcode[pos])
199+
return (mutant, source, pos, scode[pos], mcode[mpos])

0 commit comments

Comments
 (0)