Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Group3
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
Emma Dahlin
Group3
Commits
4a519f1f
Commit
4a519f1f
authored
2 years ago
by
Emma Dahlin
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_tests' into 'master'
Fix tests See merge request
!2
parents
76068900
68125121
No related branches found
No related tags found
1 merge request
!2
Fix tests
Pipeline
#77157
passed
2 years 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
+29
-16
29 additions, 16 deletions
.gitlab-ci.yml
test/src/net/sf/freecol/common/AllTests.java
+1
-1
1 addition, 1 deletion
test/src/net/sf/freecol/common/AllTests.java
with
30 additions
and
17 deletions
.gitlab-ci.yml
+
29
−
16
View file @
4a519f1f
image
:
alash325/javaant:latest
stages
:
-
build
-
test
-
deploy
build
:
stage
:
build
script
:
-
ant build
script
:
-
ant build
test
:
stage
:
test
script
:
-
ant -lib test/lib/junit.jar -Dtest=AllTests testall
artifacts
:
paths
:
-
./build/report/
stage
:
test
script
:
-
ant -lib test/lib/junit.jar -Dtest=AllTests testall
artifacts
:
paths
:
-
./build/report/
reports
:
junit
:
-
./build/report/xml/TEST-*.*
pages
:
stage
:
deploy
script
:
-
mkdir .public
-
cp -r * .public
-
mv .public public
artifacts
:
paths
:
-
public
stage
:
deploy
dependencies
:
-
test
script
:
-
mv ./build/report/ public/
artifacts
:
paths
:
-
public
This diff is collapsed.
Click to expand it.
test/src/net/sf/freecol/common/AllTests.java
+
1
−
1
View file @
4a519f1f
...
...
@@ -32,7 +32,7 @@ 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