From 04dcd80adb0f964b329b990fcfe88d59265d2427 Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 27 Oct 2023 16:57:38 -0700 Subject: [PATCH] [build] Publish unit tests for examples (#5838) --- wpilibcExamples/publish.gradle | 12 ++++++++++++ wpilibcExamples/src/main/cpp/examples/examples.json | 3 ++- wpilibjExamples/publish.gradle | 12 ++++++++++++ .../edu/wpi/first/wpilibj/examples/examples.json | 3 ++- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle index 3bc1a09d02..e0fba64688 100644 --- a/wpilibcExamples/publish.gradle +++ b/wpilibcExamples/publish.gradle @@ -22,6 +22,10 @@ task cppExamplesZip(type: Zip) { from('src/main/cpp/examples') { into 'examples' } + + from('src/test/cpp/examples') { + into 'examples_test' + } } task cppTemplatesZip(type: Zip) { @@ -35,6 +39,10 @@ task cppTemplatesZip(type: Zip) { from('src/main/cpp/templates') { into 'templates' } + + from('src/test/cpp/templates') { + into 'templates_test' + } } task cppCommandsZip(type: Zip) { @@ -48,6 +56,10 @@ task cppCommandsZip(type: Zip) { from('src/main/cpp/commands') { into 'commands' } + + from('src/test/cpp/commands') { + into 'commands_test' + } } build.dependsOn cppTemplatesZip diff --git a/wpilibcExamples/src/main/cpp/examples/examples.json b/wpilibcExamples/src/main/cpp/examples/examples.json index ea49b3f4fd..803290918c 100644 --- a/wpilibcExamples/src/main/cpp/examples/examples.json +++ b/wpilibcExamples/src/main/cpp/examples/examples.json @@ -867,7 +867,8 @@ ], "foldername": "UnitTest", "gradlebase": "cpp", - "commandversion": 2 + "commandversion": 2, + "hasunittests": true }, { "name": "SimpleDifferentialDriveSimulation", diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle index a5ad1c6e26..fc90e78909 100644 --- a/wpilibjExamples/publish.gradle +++ b/wpilibjExamples/publish.gradle @@ -22,6 +22,10 @@ task javaExamplesZip(type: Zip) { from('src/main/java/edu/wpi/first/wpilibj/examples') { into 'examples' } + + from('src/test/java/edu/wpi/first/wpilibj/examples') { + into 'examples_test' + } } task javaTemplatesZip(type: Zip) { @@ -35,6 +39,10 @@ task javaTemplatesZip(type: Zip) { from('src/main/java/edu/wpi/first/wpilibj/templates') { into 'templates' } + + from('src/test/java/edu/wpi/first/wpilibj/templates') { + into 'templates_test' + } } task javaCommandsZip(type: Zip) { @@ -48,6 +56,10 @@ task javaCommandsZip(type: Zip) { from('src/main/java/edu/wpi/first/wpilibj/commands') { into 'commands' } + + from('src/test/java/edu/wpi/first/wpilibj/commands') { + into 'commands_test' + } } build.dependsOn javaTemplatesZip diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json index 2b6e5f90a5..750e4dc7c2 100644 --- a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json +++ b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/examples.json @@ -860,7 +860,8 @@ "foldername": "unittest", "gradlebase": "java", "mainclass": "Main", - "commandversion": 2 + "commandversion": 2, + "hasunittests": true }, { "name": "DifferentialDrivePoseEstimator",