From 81ac2f77f7f88419efdf3c3afa80fd13015369c4 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 11 Feb 2008 00:17:51 -0600 Subject: [PATCH] Fix name clash --- core/compiler/{test => tests}/curry.factor | 0 core/compiler/{test => tests}/float.factor | 0 core/compiler/{test => tests}/intrinsics.factor | 0 core/compiler/{test => tests}/simple.factor | 0 core/compiler/{test => tests}/stack-trace.factor | 0 core/compiler/{test => tests}/templates-early.factor | 0 core/compiler/{test => tests}/templates.factor | 0 core/compiler/{test => tests}/tuples.factor | 0 core/vocabs/loader/loader.factor | 2 +- extra/tools/test/test-docs.factor | 2 +- extra/xml/{test => tests}/arithmetic.factor | 0 extra/xml/{test => tests}/authors.txt | 0 extra/xml/{test => tests}/errors.factor | 0 extra/xml/{test => tests}/soap.factor | 0 extra/xml/{test => tests}/soap.xml | 0 extra/xml/{test => tests}/templating.factor | 0 extra/xml/{test => tests}/test.factor | 0 extra/xml/{test => tests}/test.xml | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename core/compiler/{test => tests}/curry.factor (100%) rename core/compiler/{test => tests}/float.factor (100%) rename core/compiler/{test => tests}/intrinsics.factor (100%) rename core/compiler/{test => tests}/simple.factor (100%) rename core/compiler/{test => tests}/stack-trace.factor (100%) rename core/compiler/{test => tests}/templates-early.factor (100%) rename core/compiler/{test => tests}/templates.factor (100%) rename core/compiler/{test => tests}/tuples.factor (100%) rename extra/xml/{test => tests}/arithmetic.factor (100%) rename extra/xml/{test => tests}/authors.txt (100%) rename extra/xml/{test => tests}/errors.factor (100%) rename extra/xml/{test => tests}/soap.factor (100%) rename extra/xml/{test => tests}/soap.xml (100%) rename extra/xml/{test => tests}/templating.factor (100%) rename extra/xml/{test => tests}/test.factor (100%) rename extra/xml/{test => tests}/test.xml (100%) diff --git a/core/compiler/test/curry.factor b/core/compiler/tests/curry.factor similarity index 100% rename from core/compiler/test/curry.factor rename to core/compiler/tests/curry.factor diff --git a/core/compiler/test/float.factor b/core/compiler/tests/float.factor similarity index 100% rename from core/compiler/test/float.factor rename to core/compiler/tests/float.factor diff --git a/core/compiler/test/intrinsics.factor b/core/compiler/tests/intrinsics.factor similarity index 100% rename from core/compiler/test/intrinsics.factor rename to core/compiler/tests/intrinsics.factor diff --git a/core/compiler/test/simple.factor b/core/compiler/tests/simple.factor similarity index 100% rename from core/compiler/test/simple.factor rename to core/compiler/tests/simple.factor diff --git a/core/compiler/test/stack-trace.factor b/core/compiler/tests/stack-trace.factor similarity index 100% rename from core/compiler/test/stack-trace.factor rename to core/compiler/tests/stack-trace.factor diff --git a/core/compiler/test/templates-early.factor b/core/compiler/tests/templates-early.factor similarity index 100% rename from core/compiler/test/templates-early.factor rename to core/compiler/tests/templates-early.factor diff --git a/core/compiler/test/templates.factor b/core/compiler/tests/templates.factor similarity index 100% rename from core/compiler/test/templates.factor rename to core/compiler/tests/templates.factor diff --git a/core/compiler/test/tuples.factor b/core/compiler/tests/tuples.factor similarity index 100% rename from core/compiler/test/tuples.factor rename to core/compiler/tests/tuples.factor diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index ea3023a4f8..30d7361898 100755 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -56,7 +56,7 @@ M: vocab-link vocab-root dup "-tests.factor" vocab-dir+ vocab-path+ dup resource-exists? [ , ] [ drop ] if - dup vocab-dir "test" path+ vocab-path+ dup + dup vocab-dir "tests" path+ vocab-path+ dup ?resource-path directory keys [ ".factor" tail? ] subset [ path+ , ] with each ] { } make diff --git a/extra/tools/test/test-docs.factor b/extra/tools/test/test-docs.factor index ac561100f8..a8c7239922 100755 --- a/extra/tools/test/test-docs.factor +++ b/extra/tools/test/test-docs.factor @@ -39,7 +39,7 @@ $nl "Unit tests for a vocabulary are placed in test files in the same directory as the vocabulary source file (see " { $link "vocabs.loader" } "). Two possibilities are supported:" { $list { "Tests can be placed in a file named " { $snippet { $emphasis "vocab" } "-tests.factor" } "." } - { "Tests can be placed in files in the " { $snippet "test" } " subdirectory." } + { "Tests can be placed in files in the " { $snippet "tests" } " subdirectory." } } "The latter is used for vocabularies with more extensive test suites." $nl diff --git a/extra/xml/test/arithmetic.factor b/extra/xml/tests/arithmetic.factor similarity index 100% rename from extra/xml/test/arithmetic.factor rename to extra/xml/tests/arithmetic.factor diff --git a/extra/xml/test/authors.txt b/extra/xml/tests/authors.txt similarity index 100% rename from extra/xml/test/authors.txt rename to extra/xml/tests/authors.txt diff --git a/extra/xml/test/errors.factor b/extra/xml/tests/errors.factor similarity index 100% rename from extra/xml/test/errors.factor rename to extra/xml/tests/errors.factor diff --git a/extra/xml/test/soap.factor b/extra/xml/tests/soap.factor similarity index 100% rename from extra/xml/test/soap.factor rename to extra/xml/tests/soap.factor diff --git a/extra/xml/test/soap.xml b/extra/xml/tests/soap.xml similarity index 100% rename from extra/xml/test/soap.xml rename to extra/xml/tests/soap.xml diff --git a/extra/xml/test/templating.factor b/extra/xml/tests/templating.factor similarity index 100% rename from extra/xml/test/templating.factor rename to extra/xml/tests/templating.factor diff --git a/extra/xml/test/test.factor b/extra/xml/tests/test.factor similarity index 100% rename from extra/xml/test/test.factor rename to extra/xml/tests/test.factor diff --git a/extra/xml/test/test.xml b/extra/xml/tests/test.xml similarity index 100% rename from extra/xml/test/test.xml rename to extra/xml/tests/test.xml