fix test script

sequenceplanner · Jun 11, 2023 · f569c61 · f569c61
1 parent e25ae57
commit f569c61
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/tests/Dockerfile_foxy b/tests/Dockerfile_foxy
@@ -11,13 +11,12 @@ RUN apt-get install -y \
     libclang-dev
 
 # Get ros test messages
-RUN apt-get install -y ros-foxy-test-msgs
+RUN apt-get install -y ros-foxy-test-msgs ros-foxy-example-interfaces
 
 # Get Rust
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
 RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 COPY . /r2r
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN chmod +x /r2r/tests/test.sh
-ENTRYPOINT [ "/r2r/tests/test.sh" ]
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/Dockerfile_galactic b/tests/Dockerfile_galactic
@@ -11,13 +11,12 @@ RUN apt-get install -y \
     libclang-dev
 
 # Get ros test messages
-RUN apt-get install -y ros-galactic-test-msgs
+RUN apt-get install -y ros-galactic-test-msgs ros-galactic-example-interfaces
 
 # Get Rust
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
 RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 COPY . /r2r
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN chmod +x /r2r/tests/test.sh
-ENTRYPOINT [ "/r2r/tests/test.sh" ]
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/Dockerfile_humble b/tests/Dockerfile_humble
@@ -11,13 +11,12 @@ RUN apt-get install -y \
     libclang-dev
 
 # Get ros test messages
-RUN apt-get install -y ros-humble-test-msgs
+RUN apt-get install -y ros-humble-test-msgs ros-humble-example-interfaces
 
 # Get Rust
 RUN curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | bash -s -- -y
 RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 COPY . /r2r
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN chmod +x /r2r/tests/test.sh
-ENTRYPOINT [ "/r2r/tests/test.sh" ]
+RUN chmod +x /r2r/tests/test.bash
+ENTRYPOINT [ "/r2r/tests/test.bash" ]
diff --git a/tests/test.bash b/tests/test.bash
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# run rustup to test with latest rust version
+/root/.cargo/bin/rustup update
+
+if [ -e "/opt/ros/humble/setup.bash" ]; then
+    source "/opt/ros/humble/setup.bash"
+fi
+if [ -e "/opt/ros/galactic/setup.bash" ]; then
+    source "/opt/ros/galactic/setup.bash"
+fi
+if [ -e "/opt/ros/foxy/setup.bash" ]; then
+    source "/opt/ros/foxy/setup.bash"
+fi
+
+cd /r2r/
+/root/.cargo/bin/cargo test
diff --git a/tests/test.sh b/tests/test.sh