Restructure test/scripts/tasks and make test output more readable (#143)

Signed-off-by: Sanjula Ganepola <Sanjula.Ganepola@ibm.com>
ThePrez · Sep 12, 2024 · b2f68cb · b2f68cb
1 parent c943236
commit b2f68cb
Show file tree

Hide file tree

Showing 33 changed files with 242 additions and 2,117 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,9 +4,9 @@ name: Test Manzan
 
 on:
   push:
-    branches: [ "*" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "*" ]
+    branches: [ "main" ]
 
 env:
   remote_build_dir: /home/${{ secrets.IBMI_USER }}/testbuild/
@@ -38,6 +38,10 @@ jobs:
       - name: Install NPM Dependencies
         run: npm i -g @ibm/ibmi-ci
 
+      - name: Run ILE Tests
+        working-directory: scripts
+        run: bash ./testIle.sh
+
       - name: Install Manzan
         run: | 
           ici \
@@ -50,7 +54,7 @@ jobs:
           IBMI_PASSWORD: ${{ secrets.IBMI_PASSWORD }}
           IBMI_SSH_PORT: ${{ secrets.IBMI_SSH_PORT }}
 
-      - name: Test Manzan
+      - name: Run E2E Tests
         working-directory: test
         run: | 
           ici \

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,45 +6,51 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "deploy",
+            "label": "Deploy",
             "type": "shell",
-            "command": "./deploy.sh",
+            "command": "./scripts/deploy.sh",
             "problemMatcher": []
         },
         {
-            "label": "deployAndBuildAll",
+            "label": "Build All",
             "type": "shell",
-            "command": "./deployAndBuildAll.sh",
+            "command": "./scripts/buildAll.sh",
             "problemMatcher": []
         },
         {
-            "label": "deployAndBuildCamel",
+            "label": "Build Camel",
             "type": "shell",
-            "command": "./deployAndBuildCamel.sh",
+            "command": "./scripts/buildCamel.sh",
             "problemMatcher": []
         },
         {
-            "label": "deployAndTest",
+            "label": "Build ILE",
             "type": "shell",
-            "command": "./deployAndTest.sh",
+            "command": "./scripts/buildIle.sh",
             "problemMatcher": []
         },
         {
-            "label": "deployBuildAllAndTest",
+            "label": "Run E2E Tests",
             "type": "shell",
-            "command": "./deployBuildAllAndTest.sh",
+            "command": "./scripts/testE2e.sh",
             "problemMatcher": []
         },
         {
-            "label": "deployBuildCamelAndTest",
+            "label": "Run ILE Tests",
             "type": "shell",
-            "command": "./deployBuildCamelAndTest.sh",
+            "command": "./scripts/testIle.sh",
             "problemMatcher": []
         },
         {
-            "label": "ileUnitTest",
+            "label": "Build All and Run E2E Tests",
             "type": "shell",
-            "command": "bazel test --cxxopt=-std=c++14 --verbose_failures --test_output=all //:test_util",
+            "command": "./scripts/buildAllAndTestE2e.sh",
+            "problemMatcher": []
+        },
+        {
+            "label": "Build Camel and Run E2E Tests",
+            "type": "shell",
+            "command": "./scripts/buildCamelAndTestE2e.sh",
             "problemMatcher": []
         }
     ]

diff --git a/BUILD b/BUILD
@@ -1,7 +1,7 @@
 cc_test(
     name = "test_util",
     size = "small",
-    srcs = ["test_util.cc", "ile/src/manzan.h"],
+    srcs = ["test/ile/test_util.cc", "ile/src/manzan.h"],
     deps = [
         "@googletest//:gtest",
         "@googletest//:gtest_main",