Merge pull request #54 from lf-lang/directory-reorganization

Synchronizion of rust-rti's directory structure with reactor-c
lf-lang · May 1, 2024 · eccf1dd · eccf1dd
2 parents 04029b3 + d82375e
commit eccf1dd
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -15,17 +15,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build
-      run: cd rust/rti; cargo build --verbose
+      run: cd core/federated; cargo build --verbose
 
   unit-tests:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v3
       - name: Unit tests
-        run: cd rust/rti; cargo test
+        run: cd core/federated; cargo test
 
-  lf-rust-rti:
+  integration-test:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -44,8 +44,8 @@ jobs:
         uses: chanijjani/lingua-franca/.github/actions/prepare-build-env@integration_tests_with_rust_rti 
       - name: Perform federated tests for C target with Rust RTI
         run:
-          git clone https://github.com/hokeun/lf-rust-rti.git;
-          cd lf-rust-rti;
+          git clone https://github.com/lf-lang/rust-rti.git;
+          cd rust-rti;
           git checkout ${{ github.head_ref }};
           cd ../;
           ./gradlew targetTest -Ptarget=RustRti
diff --git a/rust/.gitignore → core/.gitignore b/rust/.gitignore → core/.gitignore
diff --git a/rust/rti/Cargo.toml → core/federated/Cargo.toml b/rust/rti/Cargo.toml → core/federated/Cargo.toml
diff --git a/rust/rti/run_unit_tests.sh → core/federated/run_unit_tests.sh b/rust/rti/run_unit_tests.sh → core/federated/run_unit_tests.sh
@@ -11,9 +11,10 @@
 # 1. grcov <== cargo install grcov
 # 2. llvm-tools-preview <== rustup component add llvm-tools-preview
 
-rm -rf ./target/coverage
 rm -rf cargo-test-*
 
+rm -rf ./target/coverage
+
 CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test
 
 grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage
diff --git a/rust/rti/src/constants.rs → core/federated/src/constants.rs b/rust/rti/src/constants.rs → core/federated/src/constants.rs
diff --git a/rust/rti/src/federate_info.rs → core/federated/src/federate_info.rs b/rust/rti/src/federate_info.rs → core/federated/src/federate_info.rs
diff --git a/rust/rti/src/in_transit_message_queue.rs → ...federated/src/in_transit_message_queue.rs b/rust/rti/src/in_transit_message_queue.rs → ...federated/src/in_transit_message_queue.rs
diff --git a/rust/rti/src/lib.rs → core/federated/src/lib.rs b/rust/rti/src/lib.rs → core/federated/src/lib.rs
diff --git a/rust/rti/src/main.rs → core/federated/src/main.rs b/rust/rti/src/main.rs → core/federated/src/main.rs
diff --git a/.../rti/src/message_record/message_record.rs → ...ated/src/message_record/message_record.rs b/.../rti/src/message_record/message_record.rs → ...ated/src/message_record/message_record.rs
diff --git a/rust/rti/src/net_common.rs → core/federated/src/net_common.rs b/rust/rti/src/net_common.rs → core/federated/src/net_common.rs
diff --git a/rust/rti/src/net_util.rs → core/federated/src/net_util.rs b/rust/rti/src/net_util.rs → core/federated/src/net_util.rs
diff --git a/rust/rti/src/rti_common.rs → core/federated/src/rti_common.rs b/rust/rti/src/rti_common.rs → core/federated/src/rti_common.rs
diff --git a/rust/rti/src/rti_remote.rs → core/federated/src/rti_remote.rs b/rust/rti/src/rti_remote.rs → core/federated/src/rti_remote.rs
diff --git a/rust/rti/src/server.rs → core/federated/src/server.rs b/rust/rti/src/server.rs → core/federated/src/server.rs
diff --git a/rust/rti/src/tag.rs → core/federated/src/tag.rs b/rust/rti/src/tag.rs → core/federated/src/tag.rs
diff --git a/rust/rti/src/trace.rs → core/federated/src/trace.rs b/rust/rti/src/trace.rs → core/federated/src/trace.rs