diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-08-17 14:18:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-08-17 14:18:08 +0200 |
| commit | 51e952943128d9ae546bee3fc79e8cb8998dfb57 (patch) | |
| tree | d6a60cf581cbc566ead84e8174c7915eb7bdeafc /lib/odbc/test/mysql.erl | |
| parent | 46af29aac0e851105620dab25644cf27219e2b0a (diff) | |
| parent | 95a09939d033f8bf347f5196a9cccc4d3d34e056 (diff) | |
| download | otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.tar.gz otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.tar.bz2 otp-51e952943128d9ae546bee3fc79e8cb8998dfb57.zip | |
Merge branch 'ia/odbc/skip-tests-because-of-driver-issues' into dev
* ia/odbc/skip-tests-because-of-driver-issues:
Skip test if not applicable
Diffstat (limited to 'lib/odbc/test/mysql.erl')
| -rw-r--r-- | lib/odbc/test/mysql.erl | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/odbc/test/mysql.erl b/lib/odbc/test/mysql.erl index 49068c4356..c990793213 100644 --- a/lib/odbc/test/mysql.erl +++ b/lib/odbc/test/mysql.erl @@ -26,7 +26,22 @@ %------------------------------------------------------------------------- connection_string() -> - "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';". + case test_server:os_type() of + {unix, linux} -> + "DSN=MySQL;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"; + {unix, sunos} -> + solaris_str(); + {unix, darwin} -> + "DSN=MySQLMac;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';" + end. + +solaris_str() -> + case erlang:system_info(system_architecture) of + "sparc" ++ _ -> + "DSN=MySQLSolaris10;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';"; + "i386" ++ _ -> + "DSN=MySQLSolaris10i386;Database=odbctest;Uid=odbctest;Pwd=gurka;CHARSET=utf8;SSTMT=SET NAMES 'utf8';" + end. %------------------------------------------------------------------------- insert_result() -> |