From a87118560a8e0a68491709b916b14d07549185a4 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 7 Jul 2015 14:30:43 -0400 Subject: [PATCH 1/1] pcap: Fix pcap tests skipped when running from RunAllCoreTests Change-Id: Ic28140a87d6417081d345640d9f2fe9ddc5b6c8c Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/51526 Reviewed-by: Hudson CI Reviewed-by: Alexandre Montplaisir Tested-by: Alexandre Montplaisir --- .../pcap/core/tests/shared/PcapTestTrace.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pcap/org.eclipse.tracecompass.pcap.core.tests/shared/org/eclipse/tracecompass/pcap/core/tests/shared/PcapTestTrace.java b/pcap/org.eclipse.tracecompass.pcap.core.tests/shared/org/eclipse/tracecompass/pcap/core/tests/shared/PcapTestTrace.java index 61b0425949..107c72c2ed 100644 --- a/pcap/org.eclipse.tracecompass.pcap.core.tests/shared/org/eclipse/tracecompass/pcap/core/tests/shared/PcapTestTrace.java +++ b/pcap/org.eclipse.tracecompass.pcap.core.tests/shared/org/eclipse/tracecompass/pcap/core/tests/shared/PcapTestTrace.java @@ -28,31 +28,31 @@ import org.eclipse.tracecompass.internal.pcap.core.trace.PcapFile; public enum PcapTestTrace { /** A bad pcap file. */ - BAD_PCAPFILE("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "BadPcapFile.pcap"), + BAD_PCAPFILE("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "BadPcapFile.pcap"), /** A Valid Pcap that is empty. */ - EMPTY_PCAP("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "EmptyPcap.pcap"), + EMPTY_PCAP("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "EmptyPcap.pcap"), /** A Pcap that mostly contains TCP packets. */ - MOSTLY_TCP("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "mostlyTCP.pcap"), + MOSTLY_TCP("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "mostlyTCP.pcap"), /** A Pcap that mostly contains UDP packets. */ - MOSTLY_UDP("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "mostlyUDP.pcap"), + MOSTLY_UDP("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "mostlyUDP.pcap"), /** A big-endian trace that contains two packets. */ - SHORT_BIG_ENDIAN("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "Short_BigEndian.pcap"), + SHORT_BIG_ENDIAN("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "Short_BigEndian.pcap"), /** A little-endian trace that contains two packets. */ - SHORT_LITTLE_ENDIAN("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "Short_LittleEndian.pcap"), + SHORT_LITTLE_ENDIAN("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "Short_LittleEndian.pcap"), /** A large trace for benchmarking. */ - BENCHMARK_TRACE("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "benchmarkTrace.pcap"), + BENCHMARK_TRACE("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "benchmarkTrace.pcap"), /** A Kernel trace directory. */ - KERNEL_DIRECTORY("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "kernel"), + KERNEL_DIRECTORY("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "kernel"), /** A Kernel trace file. */ - KERNEL_TRACE("..", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "kernel", "channel0_0"); + KERNEL_TRACE("..", "..", "pcap", "org.eclipse.tracecompass.pcap.core.tests", "rsc", "kernel", "channel0_0"); private final @NonNull Path fPath; -- 2.34.1