Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

no need for replacement-file argument #26

Merged
merged 1 commit into from
Jul 5, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions do_like_javac/tools/dyntrace.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@ def lib(jar):
lib("hamcrest-core-1.3.jar"),
compile_classpath])
replace_call_classpath = lib('replacecall.jar')
replacement_file = lib('default-replacements.txt')

if 'randoop' in run_parts:
classes = sorted(common.get_classes(java_command))
class_list_file = make_class_list(test_class_directory, classes)
junit_after_path = get_special_file("junit-after", out_dir, i)

generate_tests(args, randoop_classpath, class_list_file, test_src_dir, junit_after_path, replace_call_classpath, replacement_file)
generate_tests(args, randoop_classpath, class_list_file, test_src_dir, junit_after_path, replace_call_classpath)
files_to_compile = get_files_to_compile(test_src_dir)
compile_test_cases(args, compile_classpath, test_class_directory, files_to_compile)

Expand Down Expand Up @@ -120,7 +119,7 @@ def make_class_list(out_dir, classes):
class_file.flush()
return class_file.name

def generate_tests(args, classpath, class_list_file, test_src_dir, junit_after_path, rc_classpath, replacement_file, time_limit=200, output_limit=4000):
def generate_tests(args, classpath, class_list_file, test_src_dir, junit_after_path, rc_classpath, time_limit=200, output_limit=4000):

# Methods to be omitted due to non-determinism.
omitted_methods = "\"(org\\.la4j\\.operation\\.ooplace\\.OoPlaceKroneckerProduct\\.applyCommon)|(PseudoOracle\\.verifyFace)|(org\\.znerd\\.math\\.NumberCentral\\.createRandomInteger)|(org\\.jbox2d\\.common\\.MathUtils\\.randomFloat.*)|(org\\.jbox2d\\.utests\\.MathTest\\.testFastMath)|(org\\.jbox2d\\.testbed\\.tests\\.DynamicTreeTest.*)|(org\\.la4j\\.Matrix.*)\""
Expand All @@ -132,7 +131,7 @@ def generate_tests(args, classpath, class_list_file, test_src_dir, junit_after_p
randoop_command = ["java", "-ea",
"-classpath", classpath,
"-Xbootclasspath/a:{}".format(rc_classpath),
"-javaagent:{}=--replacement-file={}".format(rc_classpath, replacement_file),
"-javaagent:{}".format(rc_classpath),
"randoop.main.Main", "gentests",
"--classlist={}".format(class_list_file),
"--time-limit={}".format(time_limit),
Expand Down