tests: explicitly enable reorganize_definitions

This adds the `reorganize_definitions` transform,
as well as the `rename_unnamed` transform that always seems to accompany it.
For the transpiler, it's not enabled directly,
just using `--reorganize-definitions --disable-refactoring`,
which adds the annotations needed by `reorganize_definitions`
without actually running the refactorer yet.

Author: kkysen

tests/curl/conf.yml

@@ -12,12 +12,14 @@ requirements:
 
 transpile:
   autogen: true
-  # tflags: --reorganize-definitions
+  tflags: --reorganize-definitions --disable-refactoring
   binary: tool_main
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
     - remove_literal_suffixes
     - convert_cast_as_ptr

tests/nginx/conf.yml

@@ -14,13 +14,14 @@ cargo.refactor:
 
 transpile:
   autogen: true
-  # blocked on https://github.com/immunant/c2rust/issues/266
-  # tflags: --reorganize-definitions
+  tflags: --reorganize-definitions --disable-refactoring
   binary: nginx
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
     - remove_literal_suffixes
     - convert_cast_as_ptr

tests/python2/conf.yml

@@ -17,11 +17,14 @@ requirements:
 
 transpile:
   autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
   binary: python
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
     - remove_literal_suffixes
     - convert_cast_as_ptr

tests/redis/conf.yml

@@ -1,5 +1,6 @@
 transpile:
   autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
   binary: redis-server
 
   # needs support for __atomic_*
@@ -8,6 +9,8 @@ transpile:
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_literal_suffixes
     - convert_cast_as_ptr
     - remove_unnecessary_refs