diff options
author | Artur Signell <artur@vaadin.com> | 2012-01-31 18:55:40 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2012-01-31 18:55:40 +0200 |
commit | 92fe7ca57723007184a6f48a8e3109fc48a4ff61 (patch) | |
tree | f00f50d7bdbf99fca9b5ab13cc1f399c7cbd8968 /tests/server-side | |
parent | 94a7e95d37925e8784fc00d4b4f800f6bf7c1ee8 (diff) | |
parent | fbd4d8617b759ba7c35992c09a43a220ac151d29 (diff) | |
download | vaadin-framework-92fe7ca57723007184a6f48a8e3109fc48a4ff61.tar.gz vaadin-framework-92fe7ca57723007184a6f48a8e3109fc48a4ff61.zip |
Merge remote-tracking branch 'origin/6.8'
Conflicts:
WebContent/release-notes.html
Diffstat (limited to 'tests/server-side')
-rw-r--r-- | tests/server-side/com/vaadin/tests/server/SourceFileChecker.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java index 91aaf131f5..5d39472712 100644 --- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java +++ b/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java @@ -29,7 +29,7 @@ public class SourceFileChecker extends TestCase { return baseDirectory; } // Run in the "build" directory by build, in the project root by Eclipse - for (File f : new File("..").listFiles()) { + for (File f : new File(".").listFiles()) { if (f.getName().equals("buildhelpers")) { // We are in "build" baseDirectory = "../"; |