Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply project settings to o.e.osgi.tests #325

Merged

Conversation

Torbjorn-Svensson
Copy link
Contributor

  1. Convert to LF and ensure LF at EOF:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e
  1. Removed executable flag on files:
find . -type f -executable -print0 | \
  xargs -r0 chmod 644
  1. Format java files:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d`

@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from 2c84aca to 443dd43 Compare October 1, 2023 21:53
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from 443dd43 to 471c16f Compare November 3, 2023 18:09
Copy link

github-actions bot commented Nov 3, 2023

Test Results

   25 files  ±0     25 suites  ±0   11m 15s ⏱️ ±0s
2 156 tests ±0  2 110 ✅ ±0  46 💤 ±0  0 ❌ ±0 
2 200 runs  ±0  2 154 ✅ ±0  46 💤 ±0  0 ❌ ±0 

Results for commit 13dabee. ± Comparison against base commit b297e05.

♻️ This comment has been updated with latest results.

@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from 471c16f to 40b2fe5 Compare December 17, 2023 21:39
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from 40b2fe5 to 2a154f0 Compare January 6, 2024 18:21
@Torbjorn-Svensson
Copy link
Contributor Author

Rebased PR on 1d9eb47.
Anything I need to do prior to getting this merged?

@vogella
Copy link
Contributor

vogella commented Jan 15, 2024

Conflicts, please have a look

This was achieved by running:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
This was achieved by running:
find . -type f -executable -print0 | \
  xargs -r0 chmod 644

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from 2a154f0 to f8d0a1c Compare January 15, 2024 09:04
@Torbjorn-Svensson
Copy link
Contributor Author

Rebased on b297e05.

This was achieved by running:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d`

Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
@Torbjorn-Svensson Torbjorn-Svensson force-pushed the pr/cleanup-o.e.osgi.tests branch from f8d0a1c to 13dabee Compare January 15, 2024 11:15
@Torbjorn-Svensson
Copy link
Contributor Author

Test failure should be fixed now.

@vogella
Copy link
Contributor

vogella commented Jan 15, 2024

Test failure should be fixed now.

What did you do to fix the tests?

@Torbjorn-Svensson
Copy link
Contributor Author

Test failure should be fixed now.

What did you do to fix the tests?

I simply added a trim of the returned content when comparing to the expected number as the content has already been verified a few lines above and the only thing that is to be tested is that it's the correct number in the file.

The change was done here: https://github.com/eclipse-equinox/equinox/compare/f8d0a1c3be3a5db5b2bb9bd8a97eaec49f268119..13dabee294f6c8bb4212391f4a941db6789e04b1

@vogella vogella merged commit e2267e3 into eclipse-equinox:master Jan 15, 2024
23 of 24 checks passed
@vogella
Copy link
Contributor

vogella commented Jan 15, 2024

Thanks @Torbjorn-Svensson

@Torbjorn-Svensson Torbjorn-Svensson deleted the pr/cleanup-o.e.osgi.tests branch January 15, 2024 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants