Stop using rustpkg test

It's really janky.

Author: sfackler

.gitignore

@@ -1,3 +1,4 @@
 /.rust/
 /doc/
 /test
+/rust-postgres

.travis.yml

@@ -8,5 +8,5 @@ install:
 before_script:
   - ./travis/setup.sh
 script:
-  - rustpkg --cfg travis test
-  - rustpkg build
+  - make
+  - make test

Makefile

@@ -0,0 +1,15 @@
+RUSTPKG ?= rustpkg
+RUSTC ?= rustc
+RUST_FLAGS ?= -Z debug-info -O
+
+all:
+	$(RUSTPKG) $(RUST_FLAGS) install
+
+test:
+	$(RUSTC) $(RUST_FLAGS) --test lib.rs
+	./rust-postgres
+
+.PHONY: test
+
+clean:
+	rm -rf .rust rust-postgres rust-postgres.dSYM

lib.rs

@@ -84,60 +84,62 @@ use std::str;
 use std::task;
 use std::util;
 
-use self::error::{PostgresDbError,
-                  PostgresConnectError,
-                  InvalidUrl,
-                  DnsError,
-                  SocketError,
-                  NoSslSupport,
-                  SslError,
-                  MissingUser,
-                  DbError,
-                  UnsupportedAuthentication,
-                  MissingPassword};
-use self::message::{BackendMessage,
-                    AuthenticationOk,
-                    AuthenticationKerberosV5,
-                    AuthenticationCleartextPassword,
-                    AuthenticationMD5Password,
-                    AuthenticationSCMCredential,
-                    AuthenticationGSS,
-                    AuthenticationSSPI,
-                    BackendKeyData,
-                    BindComplete,
-                    CommandComplete,
-                    DataRow,
-                    EmptyQueryResponse,
-                    ErrorResponse,
-                    NoData,
-                    NoticeResponse,
-                    NotificationResponse,
-                    ParameterDescription,
-                    ParameterStatus,
-                    ParseComplete,
-                    PortalSuspended,
-                    ReadyForQuery,
-                    RowDescription};
-use self::message::{FrontendMessage,
-                    Bind,
-                    CancelRequest,
-                    Close,
-                    Describe,
-                    Execute,
-                    Parse,
-                    PasswordMessage,
-                    Query,
-                    StartupMessage,
-                    SslRequest,
-                    Sync,
-                    Terminate};
-use self::message::{RowDescriptionEntry, WriteMessage, ReadMessage};
-use self::types::{Oid, PostgresType, ToSql, FromSql, PgUnknownType};
+use error::{PostgresDbError,
+            PostgresConnectError,
+            InvalidUrl,
+            DnsError,
+            SocketError,
+            NoSslSupport,
+            SslError,
+            MissingUser,
+            DbError,
+            UnsupportedAuthentication,
+            MissingPassword};
+use message::{BackendMessage,
+              AuthenticationOk,
+              AuthenticationKerberosV5,
+              AuthenticationCleartextPassword,
+              AuthenticationMD5Password,
+              AuthenticationSCMCredential,
+              AuthenticationGSS,
+              AuthenticationSSPI,
+              BackendKeyData,
+              BindComplete,
+              CommandComplete,
+              DataRow,
+              EmptyQueryResponse,
+              ErrorResponse,
+              NoData,
+              NoticeResponse,
+              NotificationResponse,
+              ParameterDescription,
+              ParameterStatus,
+              ParseComplete,
+              PortalSuspended,
+              ReadyForQuery,
+              RowDescription};
+use message::{FrontendMessage,
+              Bind,
+              CancelRequest,
+              Close,
+              Describe,
+              Execute,
+              Parse,
+              PasswordMessage,
+              Query,
+              StartupMessage,
+              SslRequest,
+              Sync,
+              Terminate};
+use message::{RowDescriptionEntry, WriteMessage, ReadMessage};
+use types::{Oid, PostgresType, ToSql, FromSql, PgUnknownType};
 
 pub mod error;
 pub mod pool;
 mod message;
 pub mod types;
+#[cfg(test)]
+mod tests;
 
 static DEFAULT_PORT: Port = 5432;
 

test.rs tests.rstest.rs renamed to tests.rs

@@ -1,8 +1,3 @@
-#[feature(struct_variant, macro_rules, globs)];
-
-extern mod extra;
-extern mod openssl = "github.com/sfackler/rust-openssl";
-
 use extra::comm::DuplexStream;
 use extra::future::Future;
 use extra::time;
@@ -15,29 +10,27 @@ use std::f64;
 use std::hashmap::HashMap;
 use std::io::timer;
 
-use lib::{PostgresNoticeHandler,
-          PostgresNotification,
-          PostgresConnection,
-          PostgresStatement,
-          ResultDescription,
-          RequireSsl,
-          PreferSsl,
-          NoSsl};
-use lib::error::{DbError,
-                 DnsError,
-                 MissingPassword,
-                 Position,
-                 PostgresDbError,
-                 SyntaxError,
-                 InvalidPassword,
-                 QueryCanceled,
-                 InvalidCatalogName};
-use lib::types::{ToSql, FromSql, PgInt4, PgVarchar};
-use lib::types::array::{ArrayBase};
-use lib::types::range::{Range, Inclusive, Exclusive, RangeBound};
-use lib::pool::PostgresConnectionPool;
-
-mod lib;
+use {PostgresNoticeHandler,
+     PostgresNotification,
+     PostgresConnection,
+     PostgresStatement,
+     ResultDescription,
+     RequireSsl,
+     PreferSsl,
+     NoSsl};
+use error::{DbError,
+            DnsError,
+            MissingPassword,
+            Position,
+            PostgresDbError,
+            SyntaxError,
+            InvalidPassword,
+            QueryCanceled,
+            InvalidCatalogName};
+use types::{ToSql, FromSql, PgInt4, PgVarchar};
+use types::array::{ArrayBase};
+use types::range::{Range, Inclusive, Exclusive, RangeBound};
+use pool::PostgresConnectionPool;
 
 #[test]
 // Make sure we can take both connections at once and can still get one after
@@ -704,8 +697,8 @@ fn test_cancel_query() {
 
     do spawn {
         timer::sleep(500);
-        assert!(lib::cancel_query("postgres://postgres@localhost", &NoSsl,
-                                  cancel_data).is_ok());
+        assert!(super::cancel_query("postgres://postgres@localhost", &NoSsl,
+                                    cancel_data).is_ok());
     }
 
     match conn.try_execute("SELECT pg_sleep(10)", []) {