From 0fc6cce77af344f349d66ddaa041693d0cdc8266 Mon Sep 17 00:00:00 2001 From: jawest Date: Wed, 11 Dec 2024 16:32:09 -0800 Subject: [PATCH 1/6] add fpp-to-xml top tests to fpp-to-layout --- .../test/top_basic/TLayout.ref/C.txt | 7 ++ .../fpp-to-layout/test/top_basic/basic.fpp | 31 +++++ .../test/top_basic/basic.ref.txt | 0 .../tools/fpp-to-layout/test/top_basic/clean | 16 +++ .../tools/fpp-to-layout/test/top_basic/run | 5 + .../tools/fpp-to-layout/test/top_basic/run.sh | 6 + .../fpp-to-layout/test/top_basic/tests.sh | 3 + .../fpp-to-layout/test/top_basic/update-ref | 5 + .../test/top_basic/update-ref.sh | 5 + .../test/top_import/basic/SLayout.ref/C1.txt | 7 ++ .../test/top_import/basic/TLayout.ref/C2.txt | 7 ++ .../fpp-to-layout/test/top_import/basic/clean | 16 +++ .../test/top_import/basic/import_basic.fpp | 45 +++++++ .../top_import/basic/import_basic.ref.txt | 0 .../fpp-to-layout/test/top_import/basic/run | 5 + .../test/top_import/basic/run.sh | 7 ++ .../test/top_import/basic/tests.sh | 3 + .../test/top_import/basic/update-ref | 5 + .../test/top_import/basic/update-ref.sh | 6 + .../test/top_import/merge/SLayout.ref/C.txt | 7 ++ .../test/top_import/merge/TLayout.ref/C.txt | 21 ++++ .../fpp-to-layout/test/top_import/merge/clean | 16 +++ .../test/top_import/merge/import_merge.fpp | 46 +++++++ .../top_import/merge/import_merge.ref.txt | 0 .../fpp-to-layout/test/top_import/merge/run | 5 + .../test/top_import/merge/run.sh | 7 ++ .../test/top_import/merge/tests.sh | 3 + .../test/top_import/merge/update-ref | 5 + .../test/top_import/merge/update-ref.sh | 6 + .../top_import/pattern/SLayout.ref/Time.txt | 7 ++ .../top_import/pattern/TLayout.ref/Time.txt | 14 +++ .../test/top_import/pattern/clean | 16 +++ .../top_import/pattern/import_pattern.fpp | 25 ++++ .../top_import/pattern/import_pattern.ref.txt | 0 .../fpp-to-layout/test/top_import/pattern/run | 5 + .../test/top_import/pattern/run.sh | 7 ++ .../test/top_import/pattern/tests.sh | 3 + .../test/top_import/pattern/update-ref | 5 + .../test/top_import/pattern/update-ref.sh | 6 + .../top_import/port_num/SLayout.ref/C.txt | 7 ++ .../top_import/port_num/TLayout.ref/C.txt | 21 ++++ .../test/top_import/port_num/clean | 16 +++ .../top_import/port_num/import_port_num.fpp | 46 +++++++ .../port_num/import_port_num.ref.txt | 0 .../test/top_import/port_num/run | 5 + .../test/top_import/port_num/run.sh | 7 ++ .../test/top_import/port_num/tests.sh | 3 + .../test/top_import/port_num/update-ref | 5 + .../test/top_import/port_num/update-ref.sh | 6 + .../test/top_import/private/SLayout.ref/C.txt | 7 ++ .../test/top_import/private/TLayout.ref/C.txt | 7 ++ .../test/top_import/private/clean | 16 +++ .../top_import/private/import_private.fpp | 45 +++++++ .../top_import/private/import_private.ref.txt | 0 .../fpp-to-layout/test/top_import/private/run | 5 + .../test/top_import/private/run.sh | 7 ++ .../test/top_import/private/tests.sh | 3 + .../test/top_import/private/update-ref | 5 + .../test/top_import/private/update-ref.sh | 6 + .../top_import/transitive/ALayout.ref/C.txt | 7 ++ .../top_import/transitive/BLayout.ref/C.txt | 7 ++ .../top_import/transitive/CLayout.ref/C.txt | 7 ++ .../top_import/transitive/TLayout.ref/C.txt | 7 ++ .../test/top_import/transitive/clean | 16 +++ .../transitive/import_transitive.fpp | 42 +++++++ .../transitive/import_transitive.ref.txt | 0 .../test/top_import/transitive/run | 5 + .../test/top_import/transitive/run.sh | 9 ++ .../test/top_import/transitive/tests.sh | 3 + .../test/top_import/transitive/update-ref | 5 + .../test/top_import/transitive/update-ref.sh | 8 ++ .../unmatched/TLayout.ref/Case1.txt | 28 +++++ .../unmatched/TLayout.ref/Case2.txt | 21 ++++ .../unmatched/TLayout.ref/Case3.txt | 14 +++ .../unmatched/TLayout.ref/Case4.txt | 14 +++ .../unmatched/TLayout.ref/Case5.txt | 63 ++++++++++ .../test/top_numbering/unmatched/clean | 5 + .../unmatched/duplicate_port_num.fpp | 43 +++++++ .../unmatched/duplicate_port_num.ref.txt | 17 +++ .../unmatched/numbering_unmatched.fpp | 119 ++++++++++++++++++ .../unmatched/numbering_unmatched.ref.txt | 0 .../test/top_numbering/unmatched/run | 5 + .../test/top_numbering/unmatched/run.sh | 16 +++ .../test/top_numbering/unmatched/tests.sh | 4 + .../test/top_numbering/unmatched/update-ref | 5 + .../top_numbering/unmatched/update-ref.sh | 10 ++ .../command_list/TLayout.ref/Command.txt | 7 ++ .../TLayout.ref/CommandRegistration.txt | 7 ++ .../TLayout.ref/CommandResponse.txt | 7 ++ .../test/top_pattern/command_list/clean | 5 + .../command_list/pattern_command_list.fpp | 28 +++++ .../command_list/pattern_command_list.ref.txt | 0 .../test/top_pattern/command_list/run | 5 + .../test/top_pattern/command_list/run.sh | 8 ++ .../test/top_pattern/command_list/tests.sh | 3 + .../test/top_pattern/command_list/update-ref | 5 + .../top_pattern/command_list/update-ref.sh | 5 + .../top_pattern/event/TLayout.ref/Events.txt | 14 +++ .../test/top_pattern/event/clean | 5 + .../test/top_pattern/event/pattern_event.fpp | 23 ++++ .../top_pattern/event/pattern_event.ref.txt | 0 .../fpp-to-layout/test/top_pattern/event/run | 5 + .../test/top_pattern/event/run.sh | 6 + .../test/top_pattern/event/tests.sh | 3 + .../test/top_pattern/event/update-ref | 5 + .../test/top_pattern/event/update-ref.sh | 5 + .../event_list/TLayout.ref/Events.txt | 7 ++ .../test/top_pattern/event_list/clean | 5 + .../event_list/pattern_event_list.fpp | 23 ++++ .../event_list/pattern_event_list.ref.txt | 0 .../test/top_pattern/event_list/run | 5 + .../test/top_pattern/event_list/run.sh | 6 + .../test/top_pattern/event_list/tests.sh | 3 + .../test/top_pattern/event_list/update-ref | 5 + .../test/top_pattern/event_list/update-ref.sh | 5 + .../health_list/TLayout.ref/Health.txt | 14 +++ .../test/top_pattern/health_list/clean | 5 + .../health_list/pattern_health_list.fpp | 23 ++++ .../health_list/pattern_health_list.ref.txt | 0 .../test/top_pattern/health_list/run | 5 + .../test/top_pattern/health_list/run.sh | 6 + .../test/top_pattern/health_list/tests.sh | 3 + .../test/top_pattern/health_list/update-ref | 5 + .../top_pattern/health_list/update-ref.sh | 5 + .../param/TLayout.ref/Parameters.txt | 28 +++++ .../test/top_pattern/param/clean | 5 + .../test/top_pattern/param/pattern_param.fpp | 23 ++++ .../top_pattern/param/pattern_param.ref.txt | 0 .../fpp-to-layout/test/top_pattern/param/run | 5 + .../test/top_pattern/param/run.sh | 6 + .../test/top_pattern/param/tests.sh | 3 + .../test/top_pattern/param/update-ref | 5 + .../test/top_pattern/param/update-ref.sh | 5 + .../test/top_pattern/param_list/clean | 5 + .../param_list/pattern_param_list.fpp | 23 ++++ .../param_list/pattern_param_list.ref.txt | 0 .../test/top_pattern/param_list/run | 5 + .../test/top_pattern/param_list/run.sh | 6 + .../test/top_pattern/param_list/tests.sh | 3 + .../test/top_pattern/param_list/update-ref | 5 + .../test/top_pattern/param_list/update-ref.sh | 5 + .../test/top_pattern/telemetry/clean | 5 + .../telemetry/pattern_telemetry.fpp | 23 ++++ .../telemetry/pattern_telemetry.ref.txt | 0 .../test/top_pattern/telemetry/run | 5 + .../test/top_pattern/telemetry/run.sh | 6 + .../test/top_pattern/telemetry/tests.sh | 3 + .../test/top_pattern/telemetry/update-ref | 5 + .../test/top_pattern/telemetry/update-ref.sh | 5 + .../telemetry_list/TLayout.ref/Telemetry.txt | 7 ++ .../test/top_pattern/telemetry_list/clean | 5 + .../telemetry_list/pattern_telemetry_list.fpp | 23 ++++ .../pattern_telemetry_list.ref.txt | 0 .../test/top_pattern/telemetry_list/run | 5 + .../test/top_pattern/telemetry_list/run.sh | 6 + .../test/top_pattern/telemetry_list/tests.sh | 3 + .../top_pattern/telemetry_list/update-ref | 5 + .../top_pattern/telemetry_list/update-ref.sh | 5 + .../text_event/TLayout.ref/TextEvents.txt | 14 +++ .../test/top_pattern/text_event/clean | 5 + .../text_event/pattern_text_event.fpp | 23 ++++ .../text_event/pattern_text_event.ref.txt | 0 .../test/top_pattern/text_event/run | 5 + .../test/top_pattern/text_event/run.sh | 6 + .../test/top_pattern/text_event/tests.sh | 3 + .../test/top_pattern/text_event/update-ref | 5 + .../test/top_pattern/text_event/update-ref.sh | 5 + .../TLayout.ref/TextEvents.txt | 7 ++ .../test/top_pattern/text_event_list/clean | 5 + .../pattern_text_event_list.fpp | 23 ++++ .../pattern_text_event_list.ref.txt | 0 .../test/top_pattern/text_event_list/run | 5 + .../test/top_pattern/text_event_list/run.sh | 6 + .../test/top_pattern/text_event_list/tests.sh | 3 + .../top_pattern/text_event_list/update-ref | 5 + .../top_pattern/text_event_list/update-ref.sh | 5 + .../top_pattern/time/TLayout.ref/Time.txt | 14 +++ .../fpp-to-layout/test/top_pattern/time/clean | 5 + .../test/top_pattern/time/pattern_time.fpp | 21 ++++ .../top_pattern/time/pattern_time.ref.txt | 0 .../fpp-to-layout/test/top_pattern/time/run | 5 + .../test/top_pattern/time/run.sh | 6 + .../test/top_pattern/time/tests.sh | 3 + .../test/top_pattern/time/update-ref | 5 + .../test/top_pattern/time/update-ref.sh | 5 + .../test/top_pattern/time_existing/clean | 5 + .../time_existing/pattern_time.ref.txt | 2 + .../time_existing/pattern_time_existing.fpp | 24 ++++ .../test/top_pattern/time_existing/run | 5 + .../test/top_pattern/time_existing/run.sh | 6 + .../test/top_pattern/time_existing/tests.sh | 3 + .../test/top_pattern/time_existing/update-ref | 5 + .../top_pattern/time_existing/update-ref.sh | 5 + .../time_list/TLayout.ref/Time.txt | 7 ++ .../test/top_pattern/time_list/clean | 5 + .../time_list/pattern_time_list.fpp | 21 ++++ .../time_list/pattern_time_list.ref.txt | 0 .../test/top_pattern/time_list/run | 5 + .../test/top_pattern/time_list/run.sh | 6 + .../test/top_pattern/time_list/tests copy.sh | 3 + .../test/top_pattern/time_list/tests.sh | 3 + .../test/top_pattern/time_list/update-ref | 5 + .../test/top_pattern/time_list/update-ref.sh | 5 + 203 files changed, 1898 insertions(+) create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/TLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/basic.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/basic.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_basic/clean create mode 100755 compiler/tools/fpp-to-layout/test/top_basic/run create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_basic/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/SLayout.ref/C1.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/TLayout.ref/C2.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/basic/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/basic/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/basic/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/SLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/TLayout.ref/C.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/merge/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/merge/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/merge/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/SLayout.ref/Time.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/TLayout.ref/Time.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/pattern/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/pattern/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/SLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/TLayout.ref/C.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/port_num/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/port_num/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/SLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/TLayout.ref/C.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/private/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/import_private.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/import_private.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/private/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/private/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/ALayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/BLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/CLayout.ref/C.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/TLayout.ref/C.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/transitive/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_import/transitive/run create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case1.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case2.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case3.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case4.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case5.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.ref.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/Command.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandRegistration.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandResponse.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/command_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/TLayout.ref/Events.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/TLayout.ref/Events.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/TLayout.ref/Health.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/health_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/TLayout.ref/Parameters.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/TLayout.ref/Telemetry.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/TLayout.ref/TextEvents.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/TLayout.ref/TextEvents.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/TLayout.ref/Time.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.fpp create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/TLayout.ref/Time.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.fpp create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.ref.txt create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_list/run create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests copy.sh create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests.sh create mode 100755 compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_basic/TLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_basic/TLayout.ref/C.txt new file mode 100644 index 000000000..aea17761c --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/TLayout.ref/C.txt @@ -0,0 +1,7 @@ +c1 +pOut +0 +c2 +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_basic/basic.fpp b/compiler/tools/fpp-to-layout/test/top_basic/basic.fpp new file mode 100644 index 000000000..35805e2c5 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/basic.fpp @@ -0,0 +1,31 @@ +module M { + + port P + + passive component C1 { + + output port pOut: P + + } + + passive component C2 { + + sync input port pIn: P + + } + + instance c1: C1 base id 0x100 + instance c2: C2 base id 0x200 + + topology T { + + instance c1 + instance c2 + + connections C { + c1.pOut -> c2.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_basic/basic.ref.txt b/compiler/tools/fpp-to-layout/test/top_basic/basic.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_basic/clean b/compiler/tools/fpp-to-layout/test/top_basic/clean new file mode 100755 index 000000000..a56631a10 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_basic/run b/compiler/tools/fpp-to-layout/test/top_basic/run new file mode 100755 index 000000000..bf6f79f51 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../.. + +sh ../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_basic/run.sh b/compiler/tools/fpp-to-layout/test/top_basic/run.sh new file mode 100644 index 000000000..f07d57c27 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/run.sh @@ -0,0 +1,6 @@ +basic() +{ + run_test "" basic && \ + compare T C && \ + compare_out basic +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_basic/tests.sh b/compiler/tools/fpp-to-layout/test/top_basic/tests.sh new file mode 100644 index 000000000..81c8e56d7 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/tests.sh @@ -0,0 +1,3 @@ +tests=" +basic +" diff --git a/compiler/tools/fpp-to-layout/test/top_basic/update-ref b/compiler/tools/fpp-to-layout/test/top_basic/update-ref new file mode 100755 index 000000000..c905604d4 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../.. + +sh ../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh new file mode 100644 index 000000000..566f8cd15 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh @@ -0,0 +1,5 @@ +basic() +{ + update "" basic + move_layout_files T C +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/SLayout.ref/C1.txt b/compiler/tools/fpp-to-layout/test/top_import/basic/SLayout.ref/C1.txt new file mode 100644 index 000000000..620f40c2e --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/SLayout.ref/C1.txt @@ -0,0 +1,7 @@ +a1 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/TLayout.ref/C2.txt b/compiler/tools/fpp-to-layout/test/top_import/basic/TLayout.ref/C2.txt new file mode 100644 index 000000000..b16168014 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/TLayout.ref/C2.txt @@ -0,0 +1,7 @@ +a2 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/clean b/compiler/tools/fpp-to-layout/test/top_import/basic/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.fpp b/compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.fpp new file mode 100644 index 000000000..c72ebc04f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.fpp @@ -0,0 +1,45 @@ +module M { + + port P + + passive component A { + + output port pOut: P + + } + + passive component B { + + sync input port pIn: P + + } + + instance a1: A base id 0x100 + instance a2: A base id 0x200 + + instance b: B base id 0x400 + + topology S { + + instance a1 + instance b + + connections C1 { + a1.pOut -> b.pIn + } + + } + + topology T { + + import S + + instance a2 + + connections C2 { + a2.pOut -> b.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/basic/import_basic.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/run b/compiler/tools/fpp-to-layout/test/top_import/basic/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh b/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh new file mode 100644 index 000000000..25e520fdb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh @@ -0,0 +1,7 @@ +import_basic() +{ + run_test "" import_basic && \ + compare S C1 && \ + compare T C2 && \ + compare_out import_basic +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/basic/tests.sh new file mode 100644 index 000000000..ae722bc0d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_basic +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh new file mode 100644 index 000000000..5c5260149 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh @@ -0,0 +1,6 @@ +import_basic() +{ + update "" import_basic + move_layout_files S C1 + move_layout_files T C2 +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/SLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/merge/SLayout.ref/C.txt new file mode 100644 index 000000000..620f40c2e --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/SLayout.ref/C.txt @@ -0,0 +1,7 @@ +a1 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/TLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/merge/TLayout.ref/C.txt new file mode 100644 index 000000000..4c453c645 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/TLayout.ref/C.txt @@ -0,0 +1,21 @@ +a1 +pOut +0 +b +pIn +0 + +a1 +pOut +1 +b +pIn +0 + +a2 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/clean b/compiler/tools/fpp-to-layout/test/top_import/merge/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.fpp b/compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.fpp new file mode 100644 index 000000000..1aa6063c5 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.fpp @@ -0,0 +1,46 @@ +module M { + + port P + + passive component A { + + output port pOut: [2] P + + } + + passive component B { + + sync input port pIn: P + + } + + instance a1: A base id 0x100 + instance a2: A base id 0x200 + + instance b: B base id 0x400 + + topology S { + + instance a1 + instance b + + connections C { + a1.pOut -> b.pIn + } + + } + + topology T { + + import S + + instance a2 + + connections C { + a1.pOut -> b.pIn + a2.pOut -> b.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/merge/import_merge.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/run b/compiler/tools/fpp-to-layout/test/top_import/merge/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh b/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh new file mode 100644 index 000000000..dff7674ba --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh @@ -0,0 +1,7 @@ +import_merge() +{ + run_test "" import_merge && \ + compare S C && \ + compare T C && \ + compare_out import_merge +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/merge/tests.sh new file mode 100644 index 000000000..9fef16b0f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_merge +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh new file mode 100644 index 000000000..9821cdb31 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh @@ -0,0 +1,6 @@ +import_merge() +{ + update "" import_merge + move_layout_files S C + move_layout_files T C +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/SLayout.ref/Time.txt b/compiler/tools/fpp-to-layout/test/top_import/pattern/SLayout.ref/Time.txt new file mode 100644 index 000000000..2077849ee --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/SLayout.ref/Time.txt @@ -0,0 +1,7 @@ +c1 +timeGetOut +0 +time +timeGetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/TLayout.ref/Time.txt b/compiler/tools/fpp-to-layout/test/top_import/pattern/TLayout.ref/Time.txt new file mode 100644 index 000000000..8c98c48eb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/TLayout.ref/Time.txt @@ -0,0 +1,14 @@ +c1 +timeGetOut +0 +time +timeGetIn +0 + +c2 +timeGetOut +0 +time +timeGetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/clean b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.fpp b/compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.fpp new file mode 100644 index 000000000..d80a8487f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.fpp @@ -0,0 +1,25 @@ +module Fw { + type Time + port Time($time: Fw.Time) +} +module M { + passive component Time { + sync input port timeGetIn: Fw.Time + } + passive component C { + time get port timeGetOut + } + instance $time: Time base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology S { + instance $time + instance c1 + time connections instance $time + } + topology T { + import S + instance c2 + time connections instance $time + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/pattern/import_pattern.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/run b/compiler/tools/fpp-to-layout/test/top_import/pattern/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh b/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh new file mode 100644 index 000000000..a19f1fb88 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh @@ -0,0 +1,7 @@ +import_pattern() +{ + run_test "" import_pattern && \ + compare S Time && \ + compare T Time && \ + compare_out import_pattern +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/pattern/tests.sh new file mode 100644 index 000000000..b7afddfee --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_pattern +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh new file mode 100644 index 000000000..d118417c4 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh @@ -0,0 +1,6 @@ +import_pattern() +{ + update "" import_pattern + move_layout_files S Time + move_layout_files T Time +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/SLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/port_num/SLayout.ref/C.txt new file mode 100644 index 000000000..feb096524 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/SLayout.ref/C.txt @@ -0,0 +1,7 @@ +a1 +pOut +2 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/TLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/port_num/TLayout.ref/C.txt new file mode 100644 index 000000000..8bd71fe3f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/TLayout.ref/C.txt @@ -0,0 +1,21 @@ +a1 +pOut +0 +b +pIn +0 + +a1 +pOut +2 +b +pIn +0 + +a2 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/clean b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.fpp b/compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.fpp new file mode 100644 index 000000000..e9eb1b1e1 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.fpp @@ -0,0 +1,46 @@ +module M { + + port P + + passive component A { + + output port pOut: [3] P + + } + + passive component B { + + sync input port pIn: P + + } + + instance a1: A base id 0x100 + instance a2: A base id 0x200 + + instance b: B base id 0x400 + + topology S { + + instance a1 + instance b + + connections C { + a1.pOut[2] -> b.pIn + } + + } + + topology T { + + import S + + instance a2 + + connections C { + a1.pOut -> b.pIn + a2.pOut -> b.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/port_num/import_port_num.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/run b/compiler/tools/fpp-to-layout/test/top_import/port_num/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh b/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh new file mode 100644 index 000000000..cb8b15a48 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh @@ -0,0 +1,7 @@ +import_port_num() +{ + run_test "" import_port_num && \ + compare S C && \ + compare T C && \ + compare_out import_port_num +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/port_num/tests.sh new file mode 100644 index 000000000..8fd175d32 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_port_num +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh new file mode 100644 index 000000000..4738e8b56 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh @@ -0,0 +1,6 @@ +import_port_num() +{ + update "" import_port_num + move_layout_files S C + move_layout_files T C +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/SLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/private/SLayout.ref/C.txt new file mode 100644 index 000000000..620f40c2e --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/SLayout.ref/C.txt @@ -0,0 +1,7 @@ +a1 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/TLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/private/TLayout.ref/C.txt new file mode 100644 index 000000000..b16168014 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/TLayout.ref/C.txt @@ -0,0 +1,7 @@ +a2 +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/clean b/compiler/tools/fpp-to-layout/test/top_import/private/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/import_private.fpp b/compiler/tools/fpp-to-layout/test/top_import/private/import_private.fpp new file mode 100644 index 000000000..67fad487a --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/import_private.fpp @@ -0,0 +1,45 @@ +module M { + + port P + + passive component A { + + output port pOut: P + + } + + passive component B { + + sync input port pIn: P + + } + + instance a1: A base id 0x100 + instance a2: A base id 0x200 + + instance b: B base id 0x400 + + topology S { + + private instance a1 + instance b + + connections C { + a1.pOut -> b.pIn + } + + } + + topology T { + + import S + + instance a2 + + connections C { + a2.pOut -> b.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/import_private.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/private/import_private.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/run b/compiler/tools/fpp-to-layout/test/top_import/private/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/run.sh b/compiler/tools/fpp-to-layout/test/top_import/private/run.sh new file mode 100644 index 000000000..908e86a02 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/run.sh @@ -0,0 +1,7 @@ +import_private() +{ + run_test "" import_private && \ + compare S C && \ + compare T C && \ + compare_out import_private +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/private/tests.sh new file mode 100644 index 000000000..556c322a9 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_private +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/update-ref b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh new file mode 100644 index 000000000..1e9026f4f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh @@ -0,0 +1,6 @@ +import_private() +{ + update "" import_private + move_layout_files S C + move_layout_files T C +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/ALayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/transitive/ALayout.ref/C.txt new file mode 100644 index 000000000..c618ba1bb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/ALayout.ref/C.txt @@ -0,0 +1,7 @@ +a +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/BLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/transitive/BLayout.ref/C.txt new file mode 100644 index 000000000..c618ba1bb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/BLayout.ref/C.txt @@ -0,0 +1,7 @@ +a +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/CLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/transitive/CLayout.ref/C.txt new file mode 100644 index 000000000..c618ba1bb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/CLayout.ref/C.txt @@ -0,0 +1,7 @@ +a +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/TLayout.ref/C.txt b/compiler/tools/fpp-to-layout/test/top_import/transitive/TLayout.ref/C.txt new file mode 100644 index 000000000..c618ba1bb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/TLayout.ref/C.txt @@ -0,0 +1,7 @@ +a +pOut +0 +b +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/clean b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean new file mode 100755 index 000000000..f01619b38 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean @@ -0,0 +1,16 @@ +#!/bin/sh -e + +. ../../../../../scripts/utils.sh + +clean +rm -f default-tests.sh default-update-ref.sh + +for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +do + rm $file +done + +for dir in `find . -type d -name '*Layout*'` +do + rm -r $dir +done \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.fpp b/compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.fpp new file mode 100644 index 000000000..1a9469d0f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.fpp @@ -0,0 +1,42 @@ +module M { + + port P + + passive component A { + + output port pOut: P + + } + + passive component B { + + sync input port pIn: P + + } + + instance a: A base id 0x100 + instance b: B base id 0x200 + + topology A { + + instance a + instance b + + connections C { + a.pOut -> b.pIn + } + + } + + topology B { import A } + + topology C { import A } + + topology T { + + import B + import C + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.ref.txt b/compiler/tools/fpp-to-layout/test/top_import/transitive/import_transitive.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/run b/compiler/tools/fpp-to-layout/test/top_import/transitive/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh b/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh new file mode 100644 index 000000000..dfb6d35fc --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh @@ -0,0 +1,9 @@ +import_transitive() +{ + run_test "" import_transitive && \ + compare A C && \ + compare B C && \ + compare C C && \ + compare T C && \ + compare_out import_transitive +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/tests.sh b/compiler/tools/fpp-to-layout/test/top_import/transitive/tests.sh new file mode 100644 index 000000000..aa7847f56 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/tests.sh @@ -0,0 +1,3 @@ +tests=" +import_transitive +" diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref new file mode 100755 index 000000000..4b2360a89 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../../ + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh new file mode 100644 index 000000000..bdf57c21f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh @@ -0,0 +1,8 @@ +import_transitive() +{ + update "" import_transitive + move_layout_files A C + move_layout_files B C + move_layout_files C C + move_layout_files T C +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case1.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case1.txt new file mode 100644 index 000000000..f8c3d4477 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case1.txt @@ -0,0 +1,28 @@ +source1 +pOut +0 +target11 +pIn +0 + +source1 +pOut +1 +target11 +pIn +1 + +target11 +pOut +0 +source1 +pIn +0 + +target11 +pOut +1 +source1 +pIn +1 + diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case2.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case2.txt new file mode 100644 index 000000000..8ae91f10a --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case2.txt @@ -0,0 +1,21 @@ +source2 +pOut +0 +target21 +pIn +0 + +source2 +pOut +1 +target21 +pIn +1 + +target21 +pOut +0 +source2 +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case3.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case3.txt new file mode 100644 index 000000000..a3ce2377c --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case3.txt @@ -0,0 +1,14 @@ +source3 +pOut +0 +target31 +pIn +0 + +target32 +pOut +0 +source3 +pIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case4.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case4.txt new file mode 100644 index 000000000..fb277577d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case4.txt @@ -0,0 +1,14 @@ +source4 +pOut +0 +target41 +pIn +0 + +target42 +pOut +1 +source4 +pIn +1 + diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case5.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case5.txt new file mode 100644 index 000000000..cb1982730 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/TLayout.ref/Case5.txt @@ -0,0 +1,63 @@ +source5 +pOut +0 +target51 +pIn +0 + +source5 +pOut +1 +target52 +pIn +0 + +source5 +pOut +2 +target53 +pIn +0 + +source5 +pOut +3 +target54 +pIn +0 + +source5 +pOut +4 +target55 +pIn +0 + +target51 +pOut +0 +source5 +pIn +0 + +target52 +pOut +0 +source5 +pIn +1 + +target53 +pOut +0 +source5 +pIn +2 + +target54 +pOut +0 +source5 +pIn +3 + diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp new file mode 100644 index 000000000..62b51224d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp @@ -0,0 +1,43 @@ +module M { + + port P + + passive component C1 { + + output port pOut: [4] P + sync input port pIn: [4] P + + match pOut with pIn + } + + instance c1: C1 base id 0x100 + instance c2: C1 base id 0x200 + instance c3: C1 base id 0x300 + instance c4: C1 base id 0x300 + instance c5: C1 base id 0x300 + + topology T1 { + + instance c1 + instance c2 + instance c3 + instance c4 + # instance c5 + + connections P { + c1.pOut -> c2.pIn + c2.pOut -> c1.pIn[0] + unmatched c1.pOut[0] -> c3.pIn + + c3.pOut -> c4.pIn + c4.pOut -> c3.pIn + unmatched c4.pOut[0] -> c3.pIn + + + # c1.pOut -> c2.pIn + # c2.pOut -> c1.pIn[0] + # unmatched c2.pOut -> c3.pIn + } + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.ref.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.ref.txt new file mode 100644 index 000000000..3f569c065 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.ref.txt @@ -0,0 +1,17 @@ +fpp-to-layout +[ local path prefix ]/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp:28.7 + c1.pOut -> c2.pIn + ^ +error: implicit duplicate connection at matched port pOut[0] +connection is implied here: +[ local path prefix ]/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp:29.7 + c2.pOut -> c1.pIn[0] + ^ +because of matching specified here: +[ local path prefix ]/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp:10.5 + match pOut with pIn + ^ +conflicting connection is here: +[ local path prefix ]/fpp-to-layout/test/top_numbering/unmatched/duplicate_port_num.fpp:30.17 + unmatched c1.pOut[0] -> c3.pIn + ^ diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.fpp b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.fpp new file mode 100644 index 000000000..4a8a05735 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.fpp @@ -0,0 +1,119 @@ +module M { + + constant numPorts = 5 + + port P + + passive component Source { + + output port pOut: [numPorts] P + sync input port pIn: [numPorts] P + + match pOut with pIn + + } + + passive component Target { + + output port pOut: [numPorts] P + sync input port pIn: [numPorts] P + + } + + instance source1: Source base id 0x0100 + instance target11: Target base id 0x1100 + + instance source2: Source base id 0x0200 + instance target21: Target base id 0x2100 + + instance source3: Source base id 0x300 + instance target31: Source base id 0x3100 + instance target32: Source base id 0x3200 + + instance source4: Source base id 0x400 + instance target41: Source base id 0x4100 + instance target42: Source base id 0x4200 + + instance source5: Source base id 0x500 + instance target51: Source base id 0x5100 + instance target52: Source base id 0x5200 + instance target53: Source base id 0x5300 + instance target54: Source base id 0x5400 + instance target55: Source base id 0x5500 + + topology T { + + # Case 1: Matching connections to the same target + + instance source1 + instance target11 + + connections Case1 { + unmatched source1.pOut[0] -> target11.pIn[0] + unmatched target11.pOut[0] -> source1.pIn[0] + unmatched source1.pOut[1] -> target11.pIn[1] + unmatched target11.pOut[1] -> source1.pIn[1] + } + + # Case 2: Non-matching connections to the same target + + instance source2 + instance target21 + + connections Case2 { + unmatched source2.pOut[0] -> target21.pIn[0] + unmatched target21.pOut[0] -> source2.pIn[0] + unmatched source2.pOut[1] -> target21.pIn[1] + } + + # Case 3: Matching connections to different targets + + instance source3 + instance target31 + instance target32 + + connections Case3 { + unmatched source3.pOut[0] -> target31.pIn[0] + unmatched target32.pOut[0] -> source3.pIn[0] + } + + # Case 4: Non-matching connections to the same target + + instance source4 + instance target41 + instance target42 + + connections Case4 { + unmatched source4.pOut[0] -> target41.pIn[0] + unmatched target42.pOut[1] -> source4.pIn[1] + } + + # Case 5: Mixed matched and unmatched connections + + instance source5 + instance target51 + instance target52 + instance target53 + instance target54 + instance target55 + + connections Case5 { + # Matched connections with explicit numbering + source5.pOut[0] -> target51.pIn + target51.pOut -> source5.pIn[0] + # Matched connections with implicit numbering at pOut + source5.pOut -> target52.pIn + target52.pOut -> source5.pIn[1] + # Matched connections with implicit numbering at pIn + source5.pOut[2] -> target53.pIn + target53.pOut -> source5.pIn + # Matched connections with implicit numbering on both sides + source5.pOut -> target54.pIn + target54.pOut -> source5.pIn + # Unmatched connection + unmatched source5.pOut -> target55.pIn + } + + } + +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.ref.txt b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/numbering_unmatched.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh new file mode 100644 index 000000000..64ee47795 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh @@ -0,0 +1,16 @@ +duplicate_port_num() +{ + run_test "" duplicate_port_num && \ + compare_out duplicate_port_num +} + +numbering_unmatched() +{ + run_test "" numbering_unmatched && \ + compare T Case1 && \ + compare T Case2 && \ + compare T Case3 && \ + compare T Case4 && \ + compare T Case5 && \ + compare_out numbering_unmatched +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/tests.sh b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/tests.sh new file mode 100644 index 000000000..ad67a14b6 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/tests.sh @@ -0,0 +1,4 @@ +tests=" +duplicate_port_num +numbering_unmatched +" diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh new file mode 100644 index 000000000..d09f3fe43 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh @@ -0,0 +1,10 @@ +duplicate_port_num() +{ + update "" duplicate_port_num +} + +numbering_unmatched() +{ + update "" numbering_unmatched && \ + move_layout_files T Case1 Case2 Case3 Case4 Case5 +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/Command.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/Command.txt new file mode 100644 index 000000000..5fecf0486 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/Command.txt @@ -0,0 +1,7 @@ +commands +cmdOut +0 +c1 +cmdIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandRegistration.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandRegistration.txt new file mode 100644 index 000000000..af5a1f096 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandRegistration.txt @@ -0,0 +1,7 @@ +c1 +cmdRegOut +0 +commands +cmdRegIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandResponse.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandResponse.txt new file mode 100644 index 000000000..516833759 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/TLayout.ref/CommandResponse.txt @@ -0,0 +1,7 @@ +c1 +cmdResponseOut +0 +commands +cmdResponseIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.fpp new file mode 100644 index 000000000..e7721c478 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.fpp @@ -0,0 +1,28 @@ +module Fw { + port Cmd + port CmdReg + port CmdResponse +} +module M { + passive component Commands { + sync input port cmdRegIn: Fw.CmdReg + output port cmdOut: Fw.Cmd + sync input port cmdResponseIn: Fw.CmdResponse + match cmdRegIn with cmdOut + match cmdRegIn with cmdResponseIn + } + passive component C { + command reg port cmdRegOut + command recv port cmdIn + command resp port cmdResponseOut + } + instance commands: Commands base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance commands + instance c1 + instance c2 + command connections instance commands { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/pattern_command_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh new file mode 100644 index 000000000..d5da76735 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh @@ -0,0 +1,8 @@ +pattern_command_list() +{ + run_test "" pattern_command_list && \ + compare T Command && \ + compare T CommandRegistration && \ + compare T CommandResponse && \ + compare_out pattern_command_list +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/tests.sh new file mode 100644 index 000000000..de5336020 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_command_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh new file mode 100644 index 000000000..b4073c61b --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_command_list() +{ + update "" pattern_command_list + move_layout_files T Command CommandRegistration CommandResponse +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/TLayout.ref/Events.txt b/compiler/tools/fpp-to-layout/test/top_pattern/event/TLayout.ref/Events.txt new file mode 100644 index 000000000..0f169384d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/TLayout.ref/Events.txt @@ -0,0 +1,14 @@ +c1 +eventOut +0 +events +eventIn +0 + +c2 +eventOut +0 +events +eventIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/clean b/compiler/tools/fpp-to-layout/test/top_pattern/event/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.fpp new file mode 100644 index 000000000..67165817f --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port Log +} +module M { + passive component Events { + sync input port eventIn: Fw.Log + } + passive component C { + time get port timeGetOut + event port eventOut + } + instance events: Events base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance events + instance c1 + instance c2 + event connections instance events + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/event/pattern_event.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/run b/compiler/tools/fpp-to-layout/test/top_pattern/event/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh new file mode 100644 index 000000000..d6f0909da --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh @@ -0,0 +1,6 @@ +pattern_event() +{ + run_test "" pattern_event && \ + compare T Events && \ + compare_out pattern_event +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event/tests.sh new file mode 100644 index 000000000..0a58f4dac --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_event +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh new file mode 100644 index 000000000..1c16ac0c1 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh @@ -0,0 +1,5 @@ +pattern_event() +{ + update "" pattern_event + move_layout_files T Events +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/TLayout.ref/Events.txt b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/TLayout.ref/Events.txt new file mode 100644 index 000000000..7ddbb81d2 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/TLayout.ref/Events.txt @@ -0,0 +1,7 @@ +c1 +eventOut +0 +events +eventIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.fpp new file mode 100644 index 000000000..f1d075ae0 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port Log +} +module M { + passive component Events { + sync input port eventIn: Fw.Log + } + passive component C { + time get port timeGetOut + event port eventOut + } + instance events: Events base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance events + instance c1 + instance c2 + event connections instance events { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/pattern_event_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh new file mode 100644 index 000000000..864cd0858 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh @@ -0,0 +1,6 @@ +pattern_event_list() +{ + run_test "" pattern_event_list && \ + compare T Events && \ + compare_out pattern_event_list +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/tests.sh new file mode 100644 index 000000000..b88582c62 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_event_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh new file mode 100644 index 000000000..1ee7f7cd9 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_event_list() +{ + update "" pattern_event_list + move_layout_files T Events +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/TLayout.ref/Health.txt b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/TLayout.ref/Health.txt new file mode 100644 index 000000000..5b3ff466e --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/TLayout.ref/Health.txt @@ -0,0 +1,14 @@ +c1 +pingOut +0 +health +pingIn +0 + +health +pingOut +0 +c1 +pingIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.fpp new file mode 100644 index 000000000..1e923ab0b --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.fpp @@ -0,0 +1,23 @@ +module Svc { + port Ping +} +module M { + passive component Health { + sync input port pingIn: Svc.Ping + output port pingOut: Svc.Ping + match pingOut with pingIn + } + passive component C { + sync input port pingIn: Svc.Ping + output port pingOut: Svc.Ping + } + instance $health: Health base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $health + instance c1 + instance c2 + health connections instance $health { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/pattern_health_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh new file mode 100644 index 000000000..2cd75cf23 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh @@ -0,0 +1,6 @@ +pattern_health_list() +{ + run_test "" pattern_health_list && \ + compare T Health && \ + compare_out pattern_health_list +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/tests.sh new file mode 100644 index 000000000..c2a571eff --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_health_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh new file mode 100644 index 000000000..816f47a1d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_health_list() +{ + update "" pattern_health_list + move_layout_files T Health +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/TLayout.ref/Parameters.txt b/compiler/tools/fpp-to-layout/test/top_pattern/param/TLayout.ref/Parameters.txt new file mode 100644 index 000000000..ac8e9ec10 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/TLayout.ref/Parameters.txt @@ -0,0 +1,28 @@ +c1 +prmGetOut +0 +parameters +prmGetIn +0 + +c1 +prmSetOut +0 +parameters +prmSetIn +0 + +c2 +prmGetOut +0 +parameters +prmGetIn +0 + +c2 +prmSetOut +0 +parameters +prmSetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/clean b/compiler/tools/fpp-to-layout/test/top_pattern/param/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.fpp new file mode 100644 index 000000000..4c5bcc23d --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.fpp @@ -0,0 +1,23 @@ +module Fw { + port PrmGet + port PrmSet +} +module M { + passive component Parameters { + sync input port prmGetIn: Fw.PrmGet + sync input port prmSetIn: Fw.PrmSet + } + passive component C { + param get port prmGetOut + param set port prmSetOut + } + instance parameters: Parameters base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance parameters + instance c1 + instance c2 + param connections instance parameters + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/param/pattern_param.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/run b/compiler/tools/fpp-to-layout/test/top_pattern/param/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh new file mode 100644 index 000000000..c22787b79 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh @@ -0,0 +1,6 @@ +pattern_param_list() +{ + run_test "" pattern_param_list && \ + compare T Parameters && \ + compare_out pattern_param_list +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param/tests.sh new file mode 100644 index 000000000..a65692067 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_param +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh new file mode 100644 index 000000000..1aa78ffb7 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh @@ -0,0 +1,5 @@ +pattern_param() +{ + update "" pattern_param + move_layout_files T Parameters +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.fpp new file mode 100644 index 000000000..529ffdc6c --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.fpp @@ -0,0 +1,23 @@ +module Fw { + port PrmGet + port PrmSet +} +module M { + passive component Parameters { + sync input port prmGetIn: Fw.PrmGet + sync input port prmSetIn: Fw.PrmSet + } + passive component C { + param get port prmGetOut + param set port prmSetOut + } + instance parameters: Parameters base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance parameters + instance c1 + instance c2 + param connections instance parameters { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/pattern_param_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh new file mode 100644 index 000000000..df73b4bf0 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh @@ -0,0 +1,6 @@ +pattern_param() +{ + run_test "" pattern_param && \ + compare T Parameters && \ + compare_out pattern_param +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/tests.sh new file mode 100644 index 000000000..9d513bccf --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_param_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh new file mode 100644 index 000000000..9bd0fb7cd --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_telemetry() +{ + update "" pattern_telemetry + move_layout_files T Telemetry +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.fpp new file mode 100644 index 000000000..25186068c --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port Tlm +} +module M { + passive component Telemetry { + sync input port tlmIn: Fw.Tlm + } + passive component C { + time get port timeGetOut + telemetry port tlmOut + } + instance $telemetry: Telemetry base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $telemetry + instance c1 + instance c2 + telemetry connections instance $telemetry + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/pattern_telemetry.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh new file mode 100644 index 000000000..df73b4bf0 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh @@ -0,0 +1,6 @@ +pattern_param() +{ + run_test "" pattern_param && \ + compare T Parameters && \ + compare_out pattern_param +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/tests.sh new file mode 100644 index 000000000..5def0b178 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_telemetry +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh new file mode 100644 index 000000000..71886b905 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh @@ -0,0 +1,5 @@ +pattern_telemetry_list() +{ + update "" pattern_telemetry_list + move_layout_files T Telemetry +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/TLayout.ref/Telemetry.txt b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/TLayout.ref/Telemetry.txt new file mode 100644 index 000000000..6ae0946f8 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/TLayout.ref/Telemetry.txt @@ -0,0 +1,7 @@ +c1 +tlmOut +0 +telemetry +tlmIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.fpp new file mode 100644 index 000000000..81d0e600a --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port Tlm +} +module M { + passive component Telemetry { + sync input port tlmIn: Fw.Tlm + } + passive component C { + time get port timeGetOut + telemetry port tlmOut + } + instance $telemetry: Telemetry base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $telemetry + instance c1 + instance c2 + telemetry connections instance $telemetry { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/pattern_telemetry_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh new file mode 100644 index 000000000..df73b4bf0 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh @@ -0,0 +1,6 @@ +pattern_param() +{ + run_test "" pattern_param && \ + compare T Parameters && \ + compare_out pattern_param +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/tests.sh new file mode 100644 index 000000000..c78a1a8b0 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_telemetry_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh new file mode 100644 index 000000000..71886b905 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_telemetry_list() +{ + update "" pattern_telemetry_list + move_layout_files T Telemetry +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/TLayout.ref/TextEvents.txt b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/TLayout.ref/TextEvents.txt new file mode 100644 index 000000000..4630d2750 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/TLayout.ref/TextEvents.txt @@ -0,0 +1,14 @@ +c1 +textEventOut +0 +textEvents +textEventIn +0 + +c2 +textEventOut +0 +textEvents +textEventIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.fpp new file mode 100644 index 000000000..f5a23c6b4 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port LogText +} +module M { + passive component TextEvents { + sync input port textEventIn: Fw.LogText + } + passive component C { + time get port timeGetOut + text event port textEventOut + } + instance textEvents: TextEvents base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x200 + topology T { + instance textEvents + instance c1 + instance c2 + text event connections instance textEvents + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/pattern_text_event.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh new file mode 100644 index 000000000..02f0f4645 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh @@ -0,0 +1,6 @@ +pattern_text_event() +{ + run_test "" pattern_text_event && \ + compare T TextEvents && \ + compare_out pattern_text_event +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/tests.sh new file mode 100644 index 000000000..55d5e3a41 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_text_event +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh new file mode 100644 index 000000000..1be8e34fb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh @@ -0,0 +1,5 @@ +pattern_text_event() +{ + update "" pattern_text_event + move_layout_files T TextEvents +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/TLayout.ref/TextEvents.txt b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/TLayout.ref/TextEvents.txt new file mode 100644 index 000000000..21567b18a --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/TLayout.ref/TextEvents.txt @@ -0,0 +1,7 @@ +c1 +textEventOut +0 +textEvents +textEventIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.fpp new file mode 100644 index 000000000..e055dc8ba --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.fpp @@ -0,0 +1,23 @@ +module Fw { + type Time + port Time($time: Fw.Time) + port LogText +} +module M { + passive component TextEvents { + sync input port textEventIn: Fw.LogText + } + passive component C { + time get port timeGetOut + text event port textEventOut + } + instance textEvents: TextEvents base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x200 + topology T { + instance textEvents + instance c1 + instance c2 + text event connections instance textEvents { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/pattern_text_event_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh new file mode 100644 index 000000000..c5a64ea33 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh @@ -0,0 +1,6 @@ +pattern_text_event_list() +{ + run_test "" pattern_text_event_list && \ + compare T TextEvents && \ + compare_out pattern_text_event_list +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/tests.sh new file mode 100644 index 000000000..5dac094b4 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_text_event_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh new file mode 100644 index 000000000..51747a851 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_text_event_list() +{ + update "" pattern_text_event_list + move_layout_files T TextEvents +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/TLayout.ref/Time.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time/TLayout.ref/Time.txt new file mode 100644 index 000000000..8c98c48eb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/TLayout.ref/Time.txt @@ -0,0 +1,14 @@ +c1 +timeGetOut +0 +time +timeGetIn +0 + +c2 +timeGetOut +0 +time +timeGetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.fpp new file mode 100644 index 000000000..27dfcb33b --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.fpp @@ -0,0 +1,21 @@ +module Fw { + type Time + port Time($time: Fw.Time) +} +module M { + passive component Time { + sync input port timeGetIn: Fw.Time + } + passive component C { + time get port timeGetOut + } + instance $time: Time base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $time + instance c1 + instance c2 + time connections instance $time + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time/pattern_time.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/run b/compiler/tools/fpp-to-layout/test/top_pattern/time/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh new file mode 100644 index 000000000..8ed4f4c88 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh @@ -0,0 +1,6 @@ +pattern_time() +{ + run_test "" pattern_time && \ + compare T Time && \ + compare_out pattern_time +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time/tests.sh new file mode 100644 index 000000000..4406e258b --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_time +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh new file mode 100644 index 000000000..03fd3336e --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh @@ -0,0 +1,5 @@ +pattern_time() +{ + update "" pattern_time + move_layout_files T Time +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt new file mode 100644 index 000000000..c2c2ad5c8 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt @@ -0,0 +1,2 @@ +fpp-to-layout +error: cannot open file [ local path prefix ]/fpp-to-layout/test/top_pattern/time_existing/pattern_time.fpp diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.fpp new file mode 100644 index 000000000..bfdd21ed7 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.fpp @@ -0,0 +1,24 @@ +module Fw { + type Time + port Time($time: Fw.Time) +} +module M { + passive component Time { + sync input port timeGetIn: Fw.Time + } + passive component C { + time get port timeGetOut + } + instance $time: Time base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $time + instance c1 + instance c2 + time connections instance $time + connections Time { + c1.timeGetOut -> $time.timeGetIn + } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh new file mode 100644 index 000000000..dce0f58e4 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh @@ -0,0 +1,6 @@ +pattern_time_existing() +{ + run_test "" pattern_time_existing && \ + compare T Time && \ + compare_out pattern_time_existing +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/tests.sh new file mode 100644 index 000000000..0069b2939 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_time_existing +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh new file mode 100644 index 000000000..1fa7e8ffe --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh @@ -0,0 +1,5 @@ +pattern_time_existing() +{ + update "" pattern_time_existing + move_layout_files T Time +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/TLayout.ref/Time.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/TLayout.ref/Time.txt new file mode 100644 index 000000000..2077849ee --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/TLayout.ref/Time.txt @@ -0,0 +1,7 @@ +c1 +timeGetOut +0 +time +timeGetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean new file mode 100755 index 000000000..3738ab742 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean @@ -0,0 +1,5 @@ +#!/bin/sh -e + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/clean.sh \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.fpp new file mode 100644 index 000000000..83f5061fc --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.fpp @@ -0,0 +1,21 @@ +module Fw { + type Time + port Time($time: Fw.Time) +} +module M { + passive component Time { + sync input port timeGetIn: Fw.Time + } + passive component C { + time get port timeGetOut + } + instance $time: Time base id 0x100 + instance c1: C base id 0x200 + instance c2: C base id 0x300 + topology T { + instance $time + instance c1 + instance c2 + time connections instance $time { c1 } + } +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/pattern_time_list.ref.txt new file mode 100644 index 000000000..e69de29bb diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run new file mode 100755 index 000000000..6bcb2b473 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/run.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh new file mode 100644 index 000000000..8ed4f4c88 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh @@ -0,0 +1,6 @@ +pattern_time() +{ + run_test "" pattern_time && \ + compare T Time && \ + compare_out pattern_time +} \ No newline at end of file diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests copy.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests copy.sh new file mode 100644 index 000000000..066ef0630 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests copy.sh @@ -0,0 +1,3 @@ +tests=" +pattern_time_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests.sh new file mode 100644 index 000000000..066ef0630 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/tests.sh @@ -0,0 +1,3 @@ +tests=" +pattern_time_list +" diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref new file mode 100755 index 000000000..2889a0733 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref @@ -0,0 +1,5 @@ +#!/bin/sh + +export COMPILER_ROOT=../../../../.. + +sh ../../scripts/update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh new file mode 100644 index 000000000..9fb0ffe09 --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh @@ -0,0 +1,5 @@ +pattern_time_list() +{ + update "" pattern_time_list + move_layout_files T Time +} \ No newline at end of file From 96cf847a8fb524c8c22212e7a8989de7308b0d3e Mon Sep 17 00:00:00 2001 From: jawest Date: Wed, 11 Dec 2024 16:33:16 -0800 Subject: [PATCH 2/6] fix time test --- .../top_pattern/time_existing/TLayout.ref/Time.txt | 14 ++++++++++++++ .../top_pattern/time_existing/pattern_time.ref.txt | 2 -- .../time_existing/pattern_time_existing.ref.txt | 0 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/TLayout.ref/Time.txt delete mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt create mode 100644 compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.ref.txt diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/TLayout.ref/Time.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/TLayout.ref/Time.txt new file mode 100644 index 000000000..8c98c48eb --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/TLayout.ref/Time.txt @@ -0,0 +1,14 @@ +c1 +timeGetOut +0 +time +timeGetIn +0 + +c2 +timeGetOut +0 +time +timeGetIn +0 + diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt deleted file mode 100644 index c2c2ad5c8..000000000 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time.ref.txt +++ /dev/null @@ -1,2 +0,0 @@ -fpp-to-layout -error: cannot open file [ local path prefix ]/fpp-to-layout/test/top_pattern/time_existing/pattern_time.fpp diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.ref.txt b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/pattern_time_existing.ref.txt new file mode 100644 index 000000000..e69de29bb From e0f061f8077fc0d2e06b03a1a449525fb4312760 Mon Sep 17 00:00:00 2001 From: jawest Date: Tue, 7 Jan 2025 16:14:11 -0800 Subject: [PATCH 3/6] add end of file newlines --- compiler/tools/fpp-to-layout/test/duplicate_tops/clean | 2 +- compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp | 2 +- compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh | 2 +- compiler/tools/fpp-to-layout/test/multiple_tops/clean | 2 +- compiler/tools/fpp-to-layout/test/multiple_tops/run.sh | 2 +- compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/scripts/clean.sh | 2 +- compiler/tools/fpp-to-layout/test/top_basic/clean | 2 +- compiler/tools/fpp-to-layout/test/top_basic/run.sh | 2 +- compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/basic/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/basic/run.sh | 2 +- .../tools/fpp-to-layout/test/top_import/basic/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/merge/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/merge/run.sh | 2 +- .../tools/fpp-to-layout/test/top_import/merge/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/pattern/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh | 2 +- .../tools/fpp-to-layout/test/top_import/pattern/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/port_num/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh | 2 +- .../tools/fpp-to-layout/test/top_import/port_num/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/private/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/private/run.sh | 2 +- .../tools/fpp-to-layout/test/top_import/private/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_import/transitive/clean | 2 +- compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh | 2 +- .../fpp-to-layout/test/top_import/transitive/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_numbering/general/clean | 2 +- .../test/top_numbering/general/numbering_general.fpp | 2 +- compiler/tools/fpp-to-layout/test/top_numbering/general/run.sh | 2 +- .../fpp-to-layout/test/top_numbering/general/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_numbering/matched/clean | 2 +- compiler/tools/fpp-to-layout/test/top_numbering/matched/run.sh | 2 +- .../fpp-to-layout/test/top_numbering/matched/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean | 2 +- .../tools/fpp-to-layout/test/top_numbering/unmatched/run.sh | 2 +- .../fpp-to-layout/test/top_numbering/unmatched/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/command/clean | 2 +- .../fpp-to-layout/test/top_pattern/command/pattern_command.fpp | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/command/update-ref.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/command_list/clean | 2 +- .../tools/fpp-to-layout/test/top_pattern/command_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/command_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/event/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/event/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/event_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/health/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/health/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean | 2 +- .../tools/fpp-to-layout/test/top_pattern/health_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/health_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/param/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/param/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/param_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/telemetry/update-ref.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/telemetry_list/clean | 2 +- .../tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/text_event/update-ref.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/text_event_list/clean | 2 +- .../tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh | 2 +- .../test/top_pattern/text_event_list/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/time/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/time/update-ref.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/time_existing/clean | 2 +- .../tools/fpp-to-layout/test/top_pattern/time_existing/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/time_existing/update-ref.sh | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh | 2 +- .../fpp-to-layout/test/top_pattern/time_list/update-ref.sh | 2 +- 84 files changed, 84 insertions(+), 84 deletions(-) diff --git a/compiler/tools/fpp-to-layout/test/duplicate_tops/clean b/compiler/tools/fpp-to-layout/test/duplicate_tops/clean index 5ce4dca00..3d659b4a6 100755 --- a/compiler/tools/fpp-to-layout/test/duplicate_tops/clean +++ b/compiler/tools/fpp-to-layout/test/duplicate_tops/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout.ref'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp b/compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp index 927eb70c3..7b4fa3445 100644 --- a/compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp +++ b/compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp @@ -5,4 +5,4 @@ module M { } topology Duplicate { -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh b/compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh index 21c7d3d51..11ae98302 100644 --- a/compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh +++ b/compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh @@ -2,4 +2,4 @@ duplicate() { run_test '' duplicate && \ compare_out duplicate -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/multiple_tops/clean b/compiler/tools/fpp-to-layout/test/multiple_tops/clean index a56631a10..bd6cd998d 100755 --- a/compiler/tools/fpp-to-layout/test/multiple_tops/clean +++ b/compiler/tools/fpp-to-layout/test/multiple_tops/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/multiple_tops/run.sh b/compiler/tools/fpp-to-layout/test/multiple_tops/run.sh index fb0a9489c..ae029559e 100644 --- a/compiler/tools/fpp-to-layout/test/multiple_tops/run.sh +++ b/compiler/tools/fpp-to-layout/test/multiple_tops/run.sh @@ -5,4 +5,4 @@ multiple_tops() compare T1 C2 && \ compare T2 C3 && \ compare_out multiple_tops -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh b/compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh index 386f6cab2..77f871c01 100644 --- a/compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/multiple_tops/update-ref.sh @@ -3,4 +3,4 @@ multiple_tops() update "" multiple_tops move_layout_files T1 C1 C2 move_layout_files T2 C3 -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/scripts/clean.sh b/compiler/tools/fpp-to-layout/test/scripts/clean.sh index f07227c4d..d263f1b46 100644 --- a/compiler/tools/fpp-to-layout/test/scripts/clean.sh +++ b/compiler/tools/fpp-to-layout/test/scripts/clean.sh @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_basic/clean b/compiler/tools/fpp-to-layout/test/top_basic/clean index a56631a10..bd6cd998d 100755 --- a/compiler/tools/fpp-to-layout/test/top_basic/clean +++ b/compiler/tools/fpp-to-layout/test/top_basic/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_basic/run.sh b/compiler/tools/fpp-to-layout/test/top_basic/run.sh index f07d57c27..fc1756b9f 100644 --- a/compiler/tools/fpp-to-layout/test/top_basic/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_basic/run.sh @@ -3,4 +3,4 @@ basic() run_test "" basic && \ compare T C && \ compare_out basic -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh index 566f8cd15..033694e9f 100644 --- a/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_basic/update-ref.sh @@ -2,4 +2,4 @@ basic() { update "" basic move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/clean b/compiler/tools/fpp-to-layout/test/top_import/basic/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/basic/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh b/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh index 25e520fdb..79fb62fe2 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/run.sh @@ -4,4 +4,4 @@ import_basic() compare S C1 && \ compare T C2 && \ compare_out import_basic -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh index 5c5260149..4e1d25e67 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/update-ref.sh @@ -3,4 +3,4 @@ import_basic() update "" import_basic move_layout_files S C1 move_layout_files T C2 -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/clean b/compiler/tools/fpp-to-layout/test/top_import/merge/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/merge/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh b/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh index dff7674ba..7da270926 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/run.sh @@ -4,4 +4,4 @@ import_merge() compare S C && \ compare T C && \ compare_out import_merge -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh index 9821cdb31..67bd283b0 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/update-ref.sh @@ -3,4 +3,4 @@ import_merge() update "" import_merge move_layout_files S C move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/clean b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/pattern/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh b/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh index a19f1fb88..dbf4030a3 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/run.sh @@ -4,4 +4,4 @@ import_pattern() compare S Time && \ compare T Time && \ compare_out import_pattern -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh index d118417c4..d77c1cff8 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/update-ref.sh @@ -3,4 +3,4 @@ import_pattern() update "" import_pattern move_layout_files S Time move_layout_files T Time -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/clean b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/port_num/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh b/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh index cb8b15a48..943b0467a 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/run.sh @@ -4,4 +4,4 @@ import_port_num() compare S C && \ compare T C && \ compare_out import_port_num -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh index 4738e8b56..867188a9c 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/update-ref.sh @@ -3,4 +3,4 @@ import_port_num() update "" import_port_num move_layout_files S C move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/clean b/compiler/tools/fpp-to-layout/test/top_import/private/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/private/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/private/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/run.sh b/compiler/tools/fpp-to-layout/test/top_import/private/run.sh index 908e86a02..8e439d62b 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/private/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/private/run.sh @@ -4,4 +4,4 @@ import_private() compare S C && \ compare T C && \ compare_out import_private -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh index 1e9026f4f..28f963600 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/private/update-ref.sh @@ -3,4 +3,4 @@ import_private() update "" import_private move_layout_files S C move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/clean b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean index f01619b38..a821e628e 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/transitive/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean @@ -13,4 +13,4 @@ done for dir in `find . -type d -name '*Layout*'` do rm -r $dir -done \ No newline at end of file +done diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh b/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh index dfb6d35fc..001f1f28d 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/run.sh @@ -6,4 +6,4 @@ import_transitive() compare C C && \ compare T C && \ compare_out import_transitive -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh index bdf57c21f..8903e7176 100644 --- a/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/update-ref.sh @@ -5,4 +5,4 @@ import_transitive() move_layout_files B C move_layout_files C C move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/general/clean b/compiler/tools/fpp-to-layout/test/top_numbering/general/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_numbering/general/clean +++ b/compiler/tools/fpp-to-layout/test/top_numbering/general/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/general/numbering_general.fpp b/compiler/tools/fpp-to-layout/test/top_numbering/general/numbering_general.fpp index d7c9f4450..53cb8a9dd 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/general/numbering_general.fpp +++ b/compiler/tools/fpp-to-layout/test/top_numbering/general/numbering_general.fpp @@ -30,4 +30,4 @@ module M { } -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/general/run.sh b/compiler/tools/fpp-to-layout/test/top_numbering/general/run.sh index 43e861d03..a1fb19ca0 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/general/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/general/run.sh @@ -3,4 +3,4 @@ numbering_general() run_test "" numbering_general && \ compare T C && \ compare_out numbering_general -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/general/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_numbering/general/update-ref.sh index 0a753aac6..1b03652e8 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/general/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/general/update-ref.sh @@ -2,4 +2,4 @@ numbering_general() { update "" numbering_general move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/matched/clean b/compiler/tools/fpp-to-layout/test/top_numbering/matched/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_numbering/matched/clean +++ b/compiler/tools/fpp-to-layout/test/top_numbering/matched/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/matched/run.sh b/compiler/tools/fpp-to-layout/test/top_numbering/matched/run.sh index e152dc30c..445dbbaf1 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/matched/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/matched/run.sh @@ -3,4 +3,4 @@ numbering_matched() run_test "" numbering_matched && \ compare T C && \ compare_out numbering_matched -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/matched/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_numbering/matched/update-ref.sh index b0c49656a..aea2cbff0 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/matched/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/matched/update-ref.sh @@ -2,4 +2,4 @@ numbering_matched() { update "" numbering_matched move_layout_files T C -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh index 64ee47795..7b2692bef 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/run.sh @@ -13,4 +13,4 @@ numbering_unmatched() compare T Case4 && \ compare T Case5 && \ compare_out numbering_unmatched -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh index d09f3fe43..366077603 100644 --- a/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_numbering/unmatched/update-ref.sh @@ -7,4 +7,4 @@ numbering_unmatched() { update "" numbering_unmatched && \ move_layout_files T Case1 Case2 Case3 Case4 Case5 -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/clean b/compiler/tools/fpp-to-layout/test/top_pattern/command/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp index 3bd079ca9..62ccae13e 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp @@ -25,4 +25,4 @@ module M { instance c2 command connections instance commands } -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh index 7377171e4..c45e29037 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh @@ -5,4 +5,4 @@ pattern_command() compare TPatternCommand CommandRegistration && \ compare TPatternCommand CommandResponse && \ compare_out pattern_command -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh index 5ee17987a..e30a5b5fc 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh @@ -2,4 +2,4 @@ pattern_command() { update "" pattern_command move_layout_files TPatternCommand Command CommandRegistration CommandResponse -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh index d5da76735..1734f6a34 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/run.sh @@ -5,4 +5,4 @@ pattern_command_list() compare T CommandRegistration && \ compare T CommandResponse && \ compare_out pattern_command_list -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh index b4073c61b..26baf7d8c 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_command_list() { update "" pattern_command_list move_layout_files T Command CommandRegistration CommandResponse -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/clean b/compiler/tools/fpp-to-layout/test/top_pattern/event/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh index d6f0909da..c4c26fc14 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/run.sh @@ -3,4 +3,4 @@ pattern_event() run_test "" pattern_event && \ compare T Events && \ compare_out pattern_event -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh index 1c16ac0c1..e3ede10d5 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event/update-ref.sh @@ -2,4 +2,4 @@ pattern_event() { update "" pattern_event move_layout_files T Events -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh index 864cd0858..7c9ece535 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/run.sh @@ -3,4 +3,4 @@ pattern_event_list() run_test "" pattern_event_list && \ compare T Events && \ compare_out pattern_event_list -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh index 1ee7f7cd9..257c3ac33 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/event_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_event_list() { update "" pattern_event_list move_layout_files T Events -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/clean b/compiler/tools/fpp-to-layout/test/top_pattern/health/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh index 64397d422..58a046e6a 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh @@ -3,4 +3,4 @@ pattern_health() run_test "" pattern_health && \ compare TPatternHealth Health && \ compare_out pattern_health -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh index aeddd8286..dc2dbac48 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh @@ -2,4 +2,4 @@ pattern_health() { update "" pattern_health move_layout_files TPatternHealth Health -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh index 2cd75cf23..07bf7b1e9 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/run.sh @@ -3,4 +3,4 @@ pattern_health_list() run_test "" pattern_health_list && \ compare T Health && \ compare_out pattern_health_list -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh index 816f47a1d..61203fef1 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_health_list() { update "" pattern_health_list move_layout_files T Health -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/clean b/compiler/tools/fpp-to-layout/test/top_pattern/param/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh index c22787b79..86255214d 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/run.sh @@ -3,4 +3,4 @@ pattern_param_list() run_test "" pattern_param_list && \ compare T Parameters && \ compare_out pattern_param_list -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh index 1aa78ffb7..f6f78fcbe 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param/update-ref.sh @@ -2,4 +2,4 @@ pattern_param() { update "" pattern_param move_layout_files T Parameters -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh index df73b4bf0..19c02c359 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/run.sh @@ -3,4 +3,4 @@ pattern_param() run_test "" pattern_param && \ compare T Parameters && \ compare_out pattern_param -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh index 9bd0fb7cd..1b08188bb 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/param_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_telemetry() { update "" pattern_telemetry move_layout_files T Telemetry -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh index df73b4bf0..19c02c359 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/run.sh @@ -3,4 +3,4 @@ pattern_param() run_test "" pattern_param && \ compare T Parameters && \ compare_out pattern_param -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh index 71886b905..c2ab93ee3 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry/update-ref.sh @@ -2,4 +2,4 @@ pattern_telemetry_list() { update "" pattern_telemetry_list move_layout_files T Telemetry -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh index df73b4bf0..19c02c359 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/run.sh @@ -3,4 +3,4 @@ pattern_param() run_test "" pattern_param && \ compare T Parameters && \ compare_out pattern_param -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh index 71886b905..c2ab93ee3 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/telemetry_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_telemetry_list() { update "" pattern_telemetry_list move_layout_files T Telemetry -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh index 02f0f4645..561ad0850 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/run.sh @@ -3,4 +3,4 @@ pattern_text_event() run_test "" pattern_text_event && \ compare T TextEvents && \ compare_out pattern_text_event -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh index 1be8e34fb..bc502719f 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event/update-ref.sh @@ -2,4 +2,4 @@ pattern_text_event() { update "" pattern_text_event move_layout_files T TextEvents -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh index c5a64ea33..8e11e0509 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/run.sh @@ -3,4 +3,4 @@ pattern_text_event_list() run_test "" pattern_text_event_list && \ compare T TextEvents && \ compare_out pattern_text_event_list -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh index 51747a851..555692a7d 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/text_event_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_text_event_list() { update "" pattern_text_event_list move_layout_files T TextEvents -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh index 8ed4f4c88..fd952686d 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/run.sh @@ -3,4 +3,4 @@ pattern_time() run_test "" pattern_time && \ compare T Time && \ compare_out pattern_time -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh index 03fd3336e..e19ce0303 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time/update-ref.sh @@ -2,4 +2,4 @@ pattern_time() { update "" pattern_time move_layout_files T Time -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh index dce0f58e4..7bb46f153 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/run.sh @@ -3,4 +3,4 @@ pattern_time_existing() run_test "" pattern_time_existing && \ compare T Time && \ compare_out pattern_time_existing -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh index 1fa7e8ffe..75fba5af7 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_existing/update-ref.sh @@ -2,4 +2,4 @@ pattern_time_existing() { update "" pattern_time_existing move_layout_files T Time -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean index 3738ab742..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/clean @@ -2,4 +2,4 @@ export COMPILER_ROOT=../../../../.. -sh ../../scripts/clean.sh \ No newline at end of file +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh index 8ed4f4c88..fd952686d 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/run.sh @@ -3,4 +3,4 @@ pattern_time() run_test "" pattern_time && \ compare T Time && \ compare_out pattern_time -} \ No newline at end of file +} diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh index 9fb0ffe09..b4b6b7e2a 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/time_list/update-ref.sh @@ -2,4 +2,4 @@ pattern_time_list() { update "" pattern_time_list move_layout_files T Time -} \ No newline at end of file +} From 7e0a1c619fbc52c5e437bbfeb6ee20168b6d20a2 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Tue, 7 Jan 2025 18:18:26 -0800 Subject: [PATCH 4/6] Update fpp-to-layout tests --- compiler/tools/fpp-to-layout/test/.gitignore | 3 +++ compiler/tools/fpp-to-layout/test/scripts/clean.sh | 4 ++-- .../{TPatternCommandLayout.ref => TLayout.ref}/Command.txt | 0 .../CommandRegistration.txt | 0 .../CommandResponse.txt | 0 .../test/top_pattern/command/pattern_command.fpp | 2 +- .../tools/fpp-to-layout/test/top_pattern/command/run.sh | 6 +++--- .../fpp-to-layout/test/top_pattern/command/update-ref.sh | 2 +- 8 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 compiler/tools/fpp-to-layout/test/.gitignore rename compiler/tools/fpp-to-layout/test/top_pattern/command/{TPatternCommandLayout.ref => TLayout.ref}/Command.txt (100%) rename compiler/tools/fpp-to-layout/test/top_pattern/command/{TPatternCommandLayout.ref => TLayout.ref}/CommandRegistration.txt (100%) rename compiler/tools/fpp-to-layout/test/top_pattern/command/{TPatternCommandLayout.ref => TLayout.ref}/CommandResponse.txt (100%) diff --git a/compiler/tools/fpp-to-layout/test/.gitignore b/compiler/tools/fpp-to-layout/test/.gitignore new file mode 100644 index 000000000..f9ebc97bd --- /dev/null +++ b/compiler/tools/fpp-to-layout/test/.gitignore @@ -0,0 +1,3 @@ +*.diff.txt +*.out.txt +*Layout diff --git a/compiler/tools/fpp-to-layout/test/scripts/clean.sh b/compiler/tools/fpp-to-layout/test/scripts/clean.sh index d263f1b46..6498f0614 100644 --- a/compiler/tools/fpp-to-layout/test/scripts/clean.sh +++ b/compiler/tools/fpp-to-layout/test/scripts/clean.sh @@ -5,12 +5,12 @@ clean rm -rf default-tests.sh default-update-ref.sh -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` +for file in `find . -name '*.out.txt'` do rm $file done -for dir in `find . -type d -name '*Layout*'` +for dir in `find . -type d -name '*Layout'` do rm -r $dir done diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/Command.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/Command.txt similarity index 100% rename from compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/Command.txt rename to compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/Command.txt diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/CommandRegistration.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/CommandRegistration.txt similarity index 100% rename from compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/CommandRegistration.txt rename to compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/CommandRegistration.txt diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/CommandResponse.txt b/compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/CommandResponse.txt similarity index 100% rename from compiler/tools/fpp-to-layout/test/top_pattern/command/TPatternCommandLayout.ref/CommandResponse.txt rename to compiler/tools/fpp-to-layout/test/top_pattern/command/TLayout.ref/CommandResponse.txt diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp index 62ccae13e..26ce7a83d 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/pattern_command.fpp @@ -19,7 +19,7 @@ module M { instance commands: Commands base id 0x100 instance c1: C base id 0x200 instance c2: C base id 0x300 - topology TPatternCommand { + topology T { instance commands instance c1 instance c2 diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh index c45e29037..b999ccd1f 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/run.sh @@ -1,8 +1,8 @@ pattern_command() { run_test "" pattern_command && \ - compare TPatternCommand Command && \ - compare TPatternCommand CommandRegistration && \ - compare TPatternCommand CommandResponse && \ + compare T Command && \ + compare T CommandRegistration && \ + compare T CommandResponse && \ compare_out pattern_command } diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh index e30a5b5fc..dd1215269 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/command/update-ref.sh @@ -1,5 +1,5 @@ pattern_command() { update "" pattern_command - move_layout_files TPatternCommand Command CommandRegistration CommandResponse + move_layout_files T Command CommandRegistration CommandResponse } From f38ac41f964351399af84203ca06467d3b652df6 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Tue, 7 Jan 2025 18:25:47 -0800 Subject: [PATCH 5/6] Revise fpp-to-layout tests --- compiler/tools/fpp-to-layout/test/.gitignore | 1 + .../tools/fpp-to-layout/test/duplicate_tops/clean | 15 ++------------- .../tools/fpp-to-layout/test/multiple_tops/clean | 15 ++------------- compiler/tools/fpp-to-layout/test/top_basic/clean | 15 ++------------- .../fpp-to-layout/test/top_import/basic/clean | 15 ++------------- .../fpp-to-layout/test/top_import/merge/clean | 15 ++------------- .../fpp-to-layout/test/top_import/pattern/clean | 15 ++------------- .../fpp-to-layout/test/top_import/port_num/clean | 15 ++------------- .../fpp-to-layout/test/top_import/private/clean | 15 ++------------- .../test/top_import/transitive/clean | 15 ++------------- 10 files changed, 19 insertions(+), 117 deletions(-) diff --git a/compiler/tools/fpp-to-layout/test/.gitignore b/compiler/tools/fpp-to-layout/test/.gitignore index f9ebc97bd..4c620a86c 100644 --- a/compiler/tools/fpp-to-layout/test/.gitignore +++ b/compiler/tools/fpp-to-layout/test/.gitignore @@ -1,3 +1,4 @@ *.diff.txt *.out.txt *Layout +default-tests.sh diff --git a/compiler/tools/fpp-to-layout/test/duplicate_tops/clean b/compiler/tools/fpp-to-layout/test/duplicate_tops/clean index 3d659b4a6..5a2a7feb8 100755 --- a/compiler/tools/fpp-to-layout/test/duplicate_tops/clean +++ b/compiler/tools/fpp-to-layout/test/duplicate_tops/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../scripts/utils.sh +export COMPILER_ROOT=../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout.ref'` -do - rm -r $dir -done +sh ../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/multiple_tops/clean b/compiler/tools/fpp-to-layout/test/multiple_tops/clean index bd6cd998d..5a2a7feb8 100755 --- a/compiler/tools/fpp-to-layout/test/multiple_tops/clean +++ b/compiler/tools/fpp-to-layout/test/multiple_tops/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../scripts/utils.sh +export COMPILER_ROOT=../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_basic/clean b/compiler/tools/fpp-to-layout/test/top_basic/clean index bd6cd998d..5a2a7feb8 100755 --- a/compiler/tools/fpp-to-layout/test/top_basic/clean +++ b/compiler/tools/fpp-to-layout/test/top_basic/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../scripts/utils.sh +export COMPILER_ROOT=../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/basic/clean b/compiler/tools/fpp-to-layout/test/top_import/basic/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/basic/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/basic/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/merge/clean b/compiler/tools/fpp-to-layout/test/top_import/merge/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/merge/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/merge/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/pattern/clean b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/pattern/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/pattern/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/port_num/clean b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/port_num/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/port_num/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/private/clean b/compiler/tools/fpp-to-layout/test/top_import/private/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/private/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/private/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh diff --git a/compiler/tools/fpp-to-layout/test/top_import/transitive/clean b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean index a821e628e..8d322fe40 100755 --- a/compiler/tools/fpp-to-layout/test/top_import/transitive/clean +++ b/compiler/tools/fpp-to-layout/test/top_import/transitive/clean @@ -1,16 +1,5 @@ #!/bin/sh -e -. ../../../../../scripts/utils.sh +export COMPILER_ROOT=../../../../.. -clean -rm -f default-tests.sh default-update-ref.sh - -for file in `find . -name '*.ref.txt' -or -name '*.out.txt'` -do - rm $file -done - -for dir in `find . -type d -name '*Layout*'` -do - rm -r $dir -done +sh ../../scripts/clean.sh From f43b6236ce3231820099a53b441e0c7ef86a3713 Mon Sep 17 00:00:00 2001 From: Rob Bocchino Date: Tue, 7 Jan 2025 18:34:04 -0800 Subject: [PATCH 6/6] Revise fpp-to-layout tests --- compiler/tools/fpp-to-layout/test/.gitignore | 1 + .../health/{TPatternHealthLayout.ref => TLayout.ref}/Health.txt | 0 .../fpp-to-layout/test/top_pattern/health/pattern_health.fpp | 2 +- compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh | 2 +- .../tools/fpp-to-layout/test/top_pattern/health/update-ref.sh | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) rename compiler/tools/fpp-to-layout/test/top_pattern/health/{TPatternHealthLayout.ref => TLayout.ref}/Health.txt (100%) diff --git a/compiler/tools/fpp-to-layout/test/.gitignore b/compiler/tools/fpp-to-layout/test/.gitignore index 4c620a86c..b7f21551f 100644 --- a/compiler/tools/fpp-to-layout/test/.gitignore +++ b/compiler/tools/fpp-to-layout/test/.gitignore @@ -2,3 +2,4 @@ *.out.txt *Layout default-tests.sh +default-update-ref.sh diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/TPatternHealthLayout.ref/Health.txt b/compiler/tools/fpp-to-layout/test/top_pattern/health/TLayout.ref/Health.txt similarity index 100% rename from compiler/tools/fpp-to-layout/test/top_pattern/health/TPatternHealthLayout.ref/Health.txt rename to compiler/tools/fpp-to-layout/test/top_pattern/health/TLayout.ref/Health.txt diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/pattern_health.fpp b/compiler/tools/fpp-to-layout/test/top_pattern/health/pattern_health.fpp index fcc1b4597..83a1e1e8f 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/pattern_health.fpp +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/pattern_health.fpp @@ -15,7 +15,7 @@ module M { instance c1: C base id 0x200 instance c2: C base id 0x300 - topology TPatternHealth { + topology T { instance $health instance c1 instance c2 diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh index 58a046e6a..debd99824 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/run.sh @@ -1,6 +1,6 @@ pattern_health() { run_test "" pattern_health && \ - compare TPatternHealth Health && \ + compare T Health && \ compare_out pattern_health } diff --git a/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh b/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh index dc2dbac48..d374c5bf2 100644 --- a/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh +++ b/compiler/tools/fpp-to-layout/test/top_pattern/health/update-ref.sh @@ -1,5 +1,5 @@ pattern_health() { update "" pattern_health - move_layout_files TPatternHealth Health + move_layout_files T Health }