Set timeout for Linux for consistency. Fix test bug
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fdc4f0a..82ea17a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,6 +36,7 @@
run: env | grep '^JAVA'
- name: Build with Maven (Linux)
+ timeout-minutes: 60
if: runner.os == 'Linux'
continue-on-error: true
run: ./mvnw -V -B --no-transfer-progress -e -DtrimStackTrace=false -Dmaven.test.failure.ignore=true -Dsurefire.rerunFailingTestsCount=1 verify
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
index 150905b..9e957c7 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
@@ -84,13 +84,13 @@
timer.stop();
System.out.println(timer.toString());
long elapsed = timer.getElapsedNanoTime();
- assertTrue(String.format(FORMAT, maxTime, maxTime - elapsed), maxTime > elapsed);
+ assertTrue(String.format(FORMAT, maxTime, elapsed - maxTime), maxTime > elapsed);
}
@Test
public void debugDisabledByLevel() {
System.gc();
- final Timer timer = new Timer("DebugDisabled", LOOP_CNT);
+ final Timer timer = new Timer("IsEnabled", LOOP_CNT);
timer.start();
for (int i=0; i < LOOP_CNT; ++i) {
logger.isEnabled(Level.DEBUG);
@@ -98,7 +98,7 @@
timer.stop();
System.out.println(timer.toString());
long elapsed = timer.getElapsedNanoTime();
- assertTrue(String.format(FORMAT, maxTime, maxTime - elapsed), maxTime > elapsed);
+ assertTrue(String.format(FORMAT, maxTime, elapsed - maxTime), maxTime > elapsed);
}
@Test
@@ -113,7 +113,7 @@
timer.stop();
System.out.println(timer.toString());
long elapsed = timer.getElapsedNanoTime();
- assertTrue(String.format(FORMAT, maxTime, maxTime - elapsed), maxTime > elapsed);
+ assertTrue(String.format(FORMAT, maxTime, elapsed - maxTime), maxTime > elapsed);
}
/*
@Test
