Move pcre-test.rs to tests.rs

uasi · Apr 5, 2013 · 71938ac · 71938ac
1 parent 46216bd
commit 71938ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -8,8 +8,8 @@ build: $(SOURCE)
 	$(RUSTC) $(RUSTC_OPTS) --lib pcre.rc
 
 test: clean build
-	$(RUSTC) $(RUSTC_OPTS) -L . --test test-pcre.rs
-	./test-pcre
+	$(RUSTC) $(RUSTC_OPTS) -L . --test pcre.rc
+	./pcre
 
 clean:
-	rm -rf test-pcre *.dSYM *.dylib *.so
+	rm -rf pcre *.dSYM *.dylib *.so *~
diff --git a/pcre.rc b/pcre.rc
@@ -9,3 +9,6 @@
 
 pub mod pcre;
 pub mod consts;
+
+#[cfg(test)]
+mod tests;
diff --git a/test-pcre.rs → tests.rs b/test-pcre.rs → tests.rs
@@ -1,5 +1,4 @@
 extern mod std;
-extern mod pcre;
 
 #[cfg(test)]
 mod test_util {
@@ -96,9 +95,9 @@ mod test_util {
 
 #[cfg(test)]
 mod tests {
-    use test_util::*;
-    use pcre::pcre::*;
-    use pcre::consts::*;
+    use super::test_util::*;
+    use pcre::*;
+    use consts::*;
 
     #[test]
     fn test_compile() {
@@ -236,9 +235,9 @@ mod tests {
 }
 
 #[cfg(test)]
-mod test_match_extensions {
-    use test_util::*;
-    use pcre::pcre::*;
+mod match_extension_tests {
+    use super::test_util::*;
+    use pcre::*;
 
     #[test]
     fn test_group() {