Merge "Don't go through RSContext for the Java reflection (take 2)"
diff --git a/tests/F_no_pragma/stdout.txt.expect b/tests/F_no_pragma/stdout.txt.expect
index 1a30d53..67745a1 100644
--- a/tests/F_no_pragma/stdout.txt.expect
+++ b/tests/F_no_pragma/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_first.java ...
+Generating ScriptC_first.java
diff --git a/tests/F_one_definition_rule1/stdout.txt.expect b/tests/F_one_definition_rule1/stdout.txt.expect
index 497e947..8d0107b 100644
--- a/tests/F_one_definition_rule1/stdout.txt.expect
+++ b/tests/F_one_definition_rule1/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition1.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition1.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition1.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition1.java
diff --git a/tests/F_one_definition_rule2/stdout.txt.expect b/tests/F_one_definition_rule2/stdout.txt.expect
index b483b4b..d0ef649 100644
--- a/tests/F_one_definition_rule2/stdout.txt.expect
+++ b/tests/F_one_definition_rule2/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition2.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition2.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition2.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition2.java
diff --git a/tests/F_one_definition_rule3/stdout.txt.expect b/tests/F_one_definition_rule3/stdout.txt.expect
index 3121fdc..7dee31f 100644
--- a/tests/F_one_definition_rule3/stdout.txt.expect
+++ b/tests/F_one_definition_rule3/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition3.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition3.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition3.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition3.java
diff --git a/tests/F_one_definition_rule4/stdout.txt.expect b/tests/F_one_definition_rule4/stdout.txt.expect
index 5f71ee1..ad2b4e6 100644
--- a/tests/F_one_definition_rule4/stdout.txt.expect
+++ b/tests/F_one_definition_rule4/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition4.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition4.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition4.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition4.java
diff --git a/tests/F_one_definition_rule5/stdout.txt.expect b/tests/F_one_definition_rule5/stdout.txt.expect
index 8bdc8a0..0da8166 100644
--- a/tests/F_one_definition_rule5/stdout.txt.expect
+++ b/tests/F_one_definition_rule5/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition5.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition5.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition5.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition5.java
diff --git a/tests/F_one_definition_rule6/stdout.txt.expect b/tests/F_one_definition_rule6/stdout.txt.expect
index 1fee5ab..6f8a2cf 100644
--- a/tests/F_one_definition_rule6/stdout.txt.expect
+++ b/tests/F_one_definition_rule6/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition6.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition6.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition6.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition6.java
diff --git a/tests/F_one_definition_rule7/stdout.txt.expect b/tests/F_one_definition_rule7/stdout.txt.expect
index f205430..31e1467 100644
--- a/tests/F_one_definition_rule7/stdout.txt.expect
+++ b/tests/F_one_definition_rule7/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition7.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition7.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition7.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition7.java
diff --git a/tests/F_one_definition_rule8/stdout.txt.expect b/tests/F_one_definition_rule8/stdout.txt.expect
index cb2c1e0..78a147a 100644
--- a/tests/F_one_definition_rule8/stdout.txt.expect
+++ b/tests/F_one_definition_rule8/stdout.txt.expect
@@ -1,6 +1,6 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_DifferentDefinition7.java ...
-Generating ScriptField_DifferentDefinition8.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_DifferentDefinition7.java ...
-Generating ScriptField_DifferentDefinition8.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_DifferentDefinition7.java
+Generating ScriptField_DifferentDefinition8.java
+Generating ScriptC_def2.java
+Generating ScriptField_DifferentDefinition7.java
+Generating ScriptField_DifferentDefinition8.java
diff --git a/tests/P_alloc_in_struct/stdout.txt.expect b/tests/P_alloc_in_struct/stdout.txt.expect
index ff5a18c..3cdb10d 100644
--- a/tests/P_alloc_in_struct/stdout.txt.expect
+++ b/tests/P_alloc_in_struct/stdout.txt.expect
@@ -1,2 +1,2 @@
-Generating ScriptC_alloc_in_struct.java ...
-Generating ScriptField_s.java ...
+Generating ScriptC_alloc_in_struct.java
+Generating ScriptField_s.java
diff --git a/tests/P_array_init/stdout.txt.expect b/tests/P_array_init/stdout.txt.expect
index e306a86..3c58b97 100644
--- a/tests/P_array_init/stdout.txt.expect
+++ b/tests/P_array_init/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_array_init.java ...
+Generating ScriptC_array_init.java
diff --git a/tests/P_compute/stdout.txt.expect b/tests/P_compute/stdout.txt.expect
index 041ad8c..4b6fd5d 100644
--- a/tests/P_compute/stdout.txt.expect
+++ b/tests/P_compute/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_compute.java ...
+Generating ScriptC_compute.java
diff --git a/tests/P_constant/stdout.txt.expect b/tests/P_constant/stdout.txt.expect
index 3c27edd..1e0cf2b 100644
--- a/tests/P_constant/stdout.txt.expect
+++ b/tests/P_constant/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_constant.java ...
+Generating ScriptC_constant.java
diff --git a/tests/P_debug/stdout.txt.expect b/tests/P_debug/stdout.txt.expect
index 96a35cb..1fdf249 100644
--- a/tests/P_debug/stdout.txt.expect
+++ b/tests/P_debug/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_debug.java ...
+Generating ScriptC_debug.java
diff --git a/tests/P_dummy_root/stdout.txt.expect b/tests/P_dummy_root/stdout.txt.expect
index cbcf1f9..d9996e3 100644
--- a/tests/P_dummy_root/stdout.txt.expect
+++ b/tests/P_dummy_root/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_dummy_root.java ...
+Generating ScriptC_dummy_root.java
diff --git a/tests/P_export_types/stdout.txt.expect b/tests/P_export_types/stdout.txt.expect
index b48d491..fa88bf3 100644
--- a/tests/P_export_types/stdout.txt.expect
+++ b/tests/P_export_types/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_export_types.java ...
+Generating ScriptC_export_types.java
diff --git a/tests/P_float3/stdout.txt.expect b/tests/P_float3/stdout.txt.expect
index 6dfb53b..feebada 100644
--- a/tests/P_float3/stdout.txt.expect
+++ b/tests/P_float3/stdout.txt.expect
@@ -1,2 +1,2 @@
-Generating ScriptC_float3.java ...
-Generating ScriptField_s.java ...
+Generating ScriptC_float3.java
+Generating ScriptField_s.java
diff --git a/tests/P_fs_kernel/stdout.txt.expect b/tests/P_fs_kernel/stdout.txt.expect
index 4a8eafd..240941f 100644
--- a/tests/P_fs_kernel/stdout.txt.expect
+++ b/tests/P_fs_kernel/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_fs_kernel.java ...
+Generating ScriptC_fs_kernel.java
diff --git a/tests/P_ignore_warnings/stdout.txt.expect b/tests/P_ignore_warnings/stdout.txt.expect
index 5878c88..8481c5f 100644
--- a/tests/P_ignore_warnings/stdout.txt.expect
+++ b/tests/P_ignore_warnings/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_ignore_warnings.java ...
+Generating ScriptC_ignore_warnings.java
diff --git a/tests/P_kernel/stdout.txt.expect b/tests/P_kernel/stdout.txt.expect
index a58134c..47e4e73 100644
--- a/tests/P_kernel/stdout.txt.expect
+++ b/tests/P_kernel/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_kernel.java ...
+Generating ScriptC_kernel.java
diff --git a/tests/P_license/stdout.txt.expect b/tests/P_license/stdout.txt.expect
index d541562..0ebb983 100644
--- a/tests/P_license/stdout.txt.expect
+++ b/tests/P_license/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_license.java ...
+Generating ScriptC_license.java
diff --git a/tests/P_local_ref_after_return/stdout.txt.expect b/tests/P_local_ref_after_return/stdout.txt.expect
index 289da99..cbf31fb 100644
--- a/tests/P_local_ref_after_return/stdout.txt.expect
+++ b/tests/P_local_ref_after_return/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_local_ref_after_return.java ...
+Generating ScriptC_local_ref_after_return.java
diff --git a/tests/P_long64/stdout.txt.expect b/tests/P_long64/stdout.txt.expect
index 0800a7a..db06195 100644
--- a/tests/P_long64/stdout.txt.expect
+++ b/tests/P_long64/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_long64.java ...
+Generating ScriptC_long64.java
diff --git a/tests/P_math_fp/stdout.txt.expect b/tests/P_math_fp/stdout.txt.expect
index d470da1..66c9c43 100644
--- a/tests/P_math_fp/stdout.txt.expect
+++ b/tests/P_math_fp/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_math_fp.java ...
+Generating ScriptC_math_fp.java
diff --git a/tests/P_math_int/stdout.txt.expect b/tests/P_math_int/stdout.txt.expect
index 853dd4b..70d64d3 100644
--- a/tests/P_math_int/stdout.txt.expect
+++ b/tests/P_math_int/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_math_int.java ...
+Generating ScriptC_math_int.java
diff --git a/tests/P_odr_array/stdout.txt.expect b/tests/P_odr_array/stdout.txt.expect
index da4e0c1..a9a3eb8 100644
--- a/tests/P_odr_array/stdout.txt.expect
+++ b/tests/P_odr_array/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_SameDefinition1.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_SameDefinition1.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_SameDefinition1.java
+Generating ScriptC_def2.java
+Generating ScriptField_SameDefinition1.java
diff --git a/tests/P_one_definition_rule/stdout.txt.expect b/tests/P_one_definition_rule/stdout.txt.expect
index da4e0c1..a9a3eb8 100644
--- a/tests/P_one_definition_rule/stdout.txt.expect
+++ b/tests/P_one_definition_rule/stdout.txt.expect
@@ -1,4 +1,4 @@
-Generating ScriptC_def1.java ...
-Generating ScriptField_SameDefinition1.java ...
-Generating ScriptC_def2.java ...
-Generating ScriptField_SameDefinition1.java ...
+Generating ScriptC_def1.java
+Generating ScriptField_SameDefinition1.java
+Generating ScriptC_def2.java
+Generating ScriptField_SameDefinition1.java
diff --git a/tests/P_ooo_compute/stdout.txt.expect b/tests/P_ooo_compute/stdout.txt.expect
index 48de3ac..d7cbdb3 100644
--- a/tests/P_ooo_compute/stdout.txt.expect
+++ b/tests/P_ooo_compute/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_ooo_compute.java ...
+Generating ScriptC_ooo_compute.java
diff --git a/tests/P_overload/stdout.txt.expect b/tests/P_overload/stdout.txt.expect
index 84d1ff9..bd59974 100644
--- a/tests/P_overload/stdout.txt.expect
+++ b/tests/P_overload/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_overload.java ...
+Generating ScriptC_overload.java
diff --git a/tests/P_redefine_RS_VERSION/stdout.txt.expect b/tests/P_redefine_RS_VERSION/stdout.txt.expect
index 070c2c6..45aa9ae 100644
--- a/tests/P_redefine_RS_VERSION/stdout.txt.expect
+++ b/tests/P_redefine_RS_VERSION/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_redefine_RS_VERSION.java ...
+Generating ScriptC_redefine_RS_VERSION.java
diff --git a/tests/P_refcount/stdout.txt.expect b/tests/P_refcount/stdout.txt.expect
index cfd6791..5d8593c 100644
--- a/tests/P_refcount/stdout.txt.expect
+++ b/tests/P_refcount/stdout.txt.expect
@@ -1,2 +1,2 @@
-Generating ScriptC_refcount.java ...
-Generating ScriptField_hasMatrix.java ...
+Generating ScriptC_refcount.java
+Generating ScriptField_hasMatrix.java
diff --git a/tests/P_root_11_i/stdout.txt.expect b/tests/P_root_11_i/stdout.txt.expect
index d1bca5e..edb0262 100644
--- a/tests/P_root_11_i/stdout.txt.expect
+++ b/tests/P_root_11_i/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_11_i.java ...
+Generating ScriptC_root_11_i.java
diff --git a/tests/P_root_11_iouxy/stdout.txt.expect b/tests/P_root_11_iouxy/stdout.txt.expect
index 32fc9ba..28ee206 100644
--- a/tests/P_root_11_iouxy/stdout.txt.expect
+++ b/tests/P_root_11_iouxy/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_11_iouxy.java ...
+Generating ScriptC_root_11_iouxy.java
diff --git a/tests/P_root_compute/stdout.txt.expect b/tests/P_root_compute/stdout.txt.expect
index acc7d56..2cb4ff8 100644
--- a/tests/P_root_compute/stdout.txt.expect
+++ b/tests/P_root_compute/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_compute.java ...
+Generating ScriptC_root_compute.java
diff --git a/tests/P_root_compute_int32_xy/stdout.txt.expect b/tests/P_root_compute_int32_xy/stdout.txt.expect
index b435d43..1a2fcfc 100644
--- a/tests/P_root_compute_int32_xy/stdout.txt.expect
+++ b/tests/P_root_compute_int32_xy/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_compute_int32_xy.java ...
+Generating ScriptC_root_compute_int32_xy.java
diff --git a/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect b/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
index 25a9ab9..d28ca8c 100644
--- a/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
+++ b/tests/P_root_compute_non_void_ptr_usrData/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_compute_non_void_ptr_usrData.java ...
+Generating ScriptC_root_compute_non_void_ptr_usrData.java
diff --git a/tests/P_root_graphics/stdout.txt.expect b/tests/P_root_graphics/stdout.txt.expect
index 85ad4b6..d4a20a4 100644
--- a/tests/P_root_graphics/stdout.txt.expect
+++ b/tests/P_root_graphics/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_graphics.java ...
+Generating ScriptC_root_graphics.java
diff --git a/tests/P_root_graphics_13/stdout.txt.expect b/tests/P_root_graphics_13/stdout.txt.expect
index f61211e..55185c7 100644
--- a/tests/P_root_graphics_13/stdout.txt.expect
+++ b/tests/P_root_graphics_13/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_root_graphics_13.java ...
+Generating ScriptC_root_graphics_13.java
diff --git a/tests/P_rs_fp_imprecise/stdout.txt.expect b/tests/P_rs_fp_imprecise/stdout.txt.expect
index ce97497..928d48d 100644
--- a/tests/P_rs_fp_imprecise/stdout.txt.expect
+++ b/tests/P_rs_fp_imprecise/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_rs_fp_imprecise.java ...
+Generating ScriptC_rs_fp_imprecise.java
diff --git a/tests/P_rs_fp_relaxed/stdout.txt.expect b/tests/P_rs_fp_relaxed/stdout.txt.expect
index 343ca05..5fbfee9 100644
--- a/tests/P_rs_fp_relaxed/stdout.txt.expect
+++ b/tests/P_rs_fp_relaxed/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_rs_fp_relaxed.java ...
+Generating ScriptC_rs_fp_relaxed.java
diff --git a/tests/P_rs_package_name/stdout.txt.expect b/tests/P_rs_package_name/stdout.txt.expect
index 7f736f8..f3818d3 100644
--- a/tests/P_rs_package_name/stdout.txt.expect
+++ b/tests/P_rs_package_name/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_rs_package_name.java ...
+Generating ScriptC_rs_package_name.java
diff --git a/tests/P_set_target_api_11/stdout.txt.expect b/tests/P_set_target_api_11/stdout.txt.expect
index 4e0002a..30be159 100644
--- a/tests/P_set_target_api_11/stdout.txt.expect
+++ b/tests/P_set_target_api_11/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_11.java ...
+Generating ScriptC_set_target_api_11.java
diff --git a/tests/P_set_target_api_12/stdout.txt.expect b/tests/P_set_target_api_12/stdout.txt.expect
index e03fe19..ad1a013 100644
--- a/tests/P_set_target_api_12/stdout.txt.expect
+++ b/tests/P_set_target_api_12/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_12.java ...
+Generating ScriptC_set_target_api_12.java
diff --git a/tests/P_set_target_api_13/stdout.txt.expect b/tests/P_set_target_api_13/stdout.txt.expect
index 153d31c..05c8518 100644
--- a/tests/P_set_target_api_13/stdout.txt.expect
+++ b/tests/P_set_target_api_13/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_13.java ...
+Generating ScriptC_set_target_api_13.java
diff --git a/tests/P_set_target_api_14/stdout.txt.expect b/tests/P_set_target_api_14/stdout.txt.expect
index 23b32b9..80ba9ae 100644
--- a/tests/P_set_target_api_14/stdout.txt.expect
+++ b/tests/P_set_target_api_14/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_14.java ...
+Generating ScriptC_set_target_api_14.java
diff --git a/tests/P_set_target_api_15/stdout.txt.expect b/tests/P_set_target_api_15/stdout.txt.expect
index 56a2d73..32ca6f8 100644
--- a/tests/P_set_target_api_15/stdout.txt.expect
+++ b/tests/P_set_target_api_15/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_15.java ...
+Generating ScriptC_set_target_api_15.java
diff --git a/tests/P_set_target_api_16/stdout.txt.expect b/tests/P_set_target_api_16/stdout.txt.expect
index ddf6298..3af6365 100644
--- a/tests/P_set_target_api_16/stdout.txt.expect
+++ b/tests/P_set_target_api_16/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_16.java ...
+Generating ScriptC_set_target_api_16.java
diff --git a/tests/P_set_target_api_17/stdout.txt.expect b/tests/P_set_target_api_17/stdout.txt.expect
index dfa5dc9..09cf811 100644
--- a/tests/P_set_target_api_17/stdout.txt.expect
+++ b/tests/P_set_target_api_17/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_17.java ...
+Generating ScriptC_set_target_api_17.java
diff --git a/tests/P_set_target_api_18/stdout.txt.expect b/tests/P_set_target_api_18/stdout.txt.expect
index bcd61bc..99a4bc1 100644
--- a/tests/P_set_target_api_18/stdout.txt.expect
+++ b/tests/P_set_target_api_18/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_18.java ...
+Generating ScriptC_set_target_api_18.java
diff --git a/tests/P_set_target_api_19/stdout.txt.expect b/tests/P_set_target_api_19/stdout.txt.expect
index 5d92dd5..c427ede 100644
--- a/tests/P_set_target_api_19/stdout.txt.expect
+++ b/tests/P_set_target_api_19/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_set_target_api_19.java ...
+Generating ScriptC_set_target_api_19.java
diff --git a/tests/P_static_struct/stdout.txt.expect b/tests/P_static_struct/stdout.txt.expect
index 9bf4e1c..f952495 100644
--- a/tests/P_static_struct/stdout.txt.expect
+++ b/tests/P_static_struct/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_static_struct.java ...
+Generating ScriptC_static_struct.java
diff --git a/tests/P_str_escape/stdout.txt.expect b/tests/P_str_escape/stdout.txt.expect
index fd90090..2c9f647 100644
--- a/tests/P_str_escape/stdout.txt.expect
+++ b/tests/P_str_escape/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_strescape.java ...
+Generating ScriptC_strescape.java
diff --git a/tests/P_unknown_function/stdout.txt.expect b/tests/P_unknown_function/stdout.txt.expect
index 998e5aa..26e7d01 100644
--- a/tests/P_unknown_function/stdout.txt.expect
+++ b/tests/P_unknown_function/stdout.txt.expect
@@ -1,2 +1,2 @@
-Generating ScriptC_unknown_function.java ...
-Generating ScriptC_zzz.java ...
+Generating ScriptC_unknown_function.java
+Generating ScriptC_zzz.java
diff --git a/tests/P_use_RS_VERSION/stdout.txt.expect b/tests/P_use_RS_VERSION/stdout.txt.expect
index 3582a6b..1dc91c5 100644
--- a/tests/P_use_RS_VERSION/stdout.txt.expect
+++ b/tests/P_use_RS_VERSION/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_use_RS_VERSION.java ...
+Generating ScriptC_use_RS_VERSION.java
diff --git a/tests/P_warnings/stdout.txt.expect b/tests/P_warnings/stdout.txt.expect
index 6c45182..55370e2 100644
--- a/tests/P_warnings/stdout.txt.expect
+++ b/tests/P_warnings/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_warnings.java ...
+Generating ScriptC_warnings.java
diff --git a/tests/P_warnings_rsSetElementAt/stdout.txt.expect b/tests/P_warnings_rsSetElementAt/stdout.txt.expect
index b10911b..3e54eed 100644
--- a/tests/P_warnings_rsSetElementAt/stdout.txt.expect
+++ b/tests/P_warnings_rsSetElementAt/stdout.txt.expect
@@ -1 +1 @@
-Generating ScriptC_setelementat.java ...
+Generating ScriptC_setelementat.java