Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freecol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tim Hansson
freecol
Commits
6061202c
Commit
6061202c
authored
11 months ago
by
Tim Hansson
Browse files
Options
Downloads
Plain Diff
Merge branch 'fixtests' into 'master'
Fixtests See merge request
!3
parents
5ddf1dd8
64c27904
Branches
Branches containing commit
No related tags found
1 merge request
!3
Fixtests
Pipeline
#143552
passed
11 months ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+8
-4
8 additions, 4 deletions
.gitlab-ci.yml
test/src/net/sf/freecol/common/AllTests.java
+1
-2
1 addition, 2 deletions
test/src/net/sf/freecol/common/AllTests.java
with
9 additions
and
6 deletions
.gitlab-ci.yml
+
8
−
4
View file @
6061202c
...
...
@@ -8,23 +8,27 @@ stages:
build
:
stage
:
build
script
:
-
apt-get update && apt-get install -y ant
# Install Ant if it's not pre-installed in the image
-
ant build
test
:
stage
:
test
script
:
-
ant .lib test/lib/junit.jar -Dtest=allTests testall
-
apt-get update && apt-get install -y ant
# Ensure Ant is available for the test stage
-
ant -lib test/lib/junit.jar -Dtest=allTests testall
artifacts
:
paths
:
-
./build/report/
-
./build/report/
# Ensure this directory exists after tests
reports
:
junit
:
-
./buid/report/xml/TEST-*.*
-
./build/report/xml/TEST-*.*
# Fixed the typo in 'build'
pages
:
stage
:
deploy
dependencies
:
-
test
script
:
-
mv ./build/report/ public/
-
mv ./build/report/ public/
# Move the test reports to 'public/' for GitLab Pages
artifacts
:
paths
:
-
public
This diff is collapsed.
Click to expand it.
test/src/net/sf/freecol/common/AllTests.java
+
1
−
2
View file @
6061202c
...
...
@@ -32,9 +32,8 @@ public class AllTests {
suite
.
addTest
(
net
.
sf
.
freecol
.
common
.
option
.
AllTests
.
suite
());
suite
.
addTest
(
net
.
sf
.
freecol
.
common
.
model
.
AllTests
.
suite
());
suite
.
addTest
(
net
.
sf
.
freecol
.
common
.
utils
.
AllTests
.
suite
());
suite
.
addTest
(
net
.
sf
.
freecol
.
common
.
sound
.
AllTests
.
suite
());
//
suite.addTest(net.sf.freecol.common.sound.AllTests.suite());
//$JUnit-END$
return
suite
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment