From 08d13321640259a5036053852ff0c8731b54239c Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Mon, 9 Apr 2012 15:55:30 -0700 Subject: [PATCH] [1792] moved rwtest.sqlite3 under lib/testutils so that it can be shared. it's going to be used in subsequent auth tests. --- src/lib/datasrc/tests/Makefile.am | 1 - src/lib/datasrc/tests/database_unittest.cc | 2 +- src/lib/datasrc/tests/test_client.cc | 2 +- src/lib/testutils/testdata/Makefile.am | 1 + .../testdata/auth_test.sqlite3} | Bin .../testutils/testdata/auth_test.sqlite3.copied | Bin 0 -> 16384 bytes src/lib/testutils/testdata/rwtest.sqlite3 | Bin 0 -> 16384 bytes 7 files changed, 3 insertions(+), 3 deletions(-) rename src/lib/{datasrc/tests/testdata/rwtest.sqlite3 => testutils/testdata/auth_test.sqlite3} (100%) mode change 100644 => 100755 create mode 100755 src/lib/testutils/testdata/auth_test.sqlite3.copied create mode 100644 src/lib/testutils/testdata/rwtest.sqlite3 diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am index c635c33d8b..49a606e84e 100644 --- a/src/lib/datasrc/tests/Makefile.am +++ b/src/lib/datasrc/tests/Makefile.am @@ -106,7 +106,6 @@ EXTRA_DIST += testdata/mkbrokendb.c EXTRA_DIST += testdata/root.zone EXTRA_DIST += testdata/rrset_toWire1 EXTRA_DIST += testdata/rrset_toWire2 -EXTRA_DIST += testdata/rwtest.sqlite3 EXTRA_DIST += testdata/sql1.example.com.signed EXTRA_DIST += testdata/sql2.example.com.signed EXTRA_DIST += testdata/test-root.sqlite3 diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc index 9362a46f11..3f59001a55 100644 --- a/src/lib/datasrc/tests/database_unittest.cc +++ b/src/lib/datasrc/tests/database_unittest.cc @@ -1090,7 +1090,7 @@ public: // probably move this to some specialized templated method specific // to SQLite3 (or for even a longer term we should add an API to // purge the diffs table). - const char* const install_cmd = INSTALL_PROG " " TEST_DATA_DIR + const char* const install_cmd = INSTALL_PROG " " TEST_DATA_COMMONDIR "/rwtest.sqlite3 " TEST_DATA_BUILDDIR "/rwtest.sqlite3.copied"; if (system(install_cmd) != 0) { diff --git a/src/lib/datasrc/tests/test_client.cc b/src/lib/datasrc/tests/test_client.cc index 7709a3bc59..58b43e0237 100644 --- a/src/lib/datasrc/tests/test_client.cc +++ b/src/lib/datasrc/tests/test_client.cc @@ -66,7 +66,7 @@ createSQLite3Client(RRClass zclass, const Name& zname, // We always begin with an empty template SQLite3 DB file and install // the zone data from the zone file to ensure both cases have the // same test data. - const char* const install_cmd_prefix = INSTALL_PROG " " TEST_DATA_DIR + const char* const install_cmd_prefix = INSTALL_PROG " " TEST_DATA_COMMONDIR "/rwtest.sqlite3 "; const string install_cmd = string(install_cmd_prefix) + db_file; if (system(install_cmd.c_str()) != 0) { diff --git a/src/lib/testutils/testdata/Makefile.am b/src/lib/testutils/testdata/Makefile.am index a6b82064ce..b9ef53f9f1 100644 --- a/src/lib/testutils/testdata/Makefile.am +++ b/src/lib/testutils/testdata/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST += rfc5155-example.zone.signed EXTRA_DIST += example.com EXTRA_DIST += example.sqlite3 +EXTRA_DIST += rwtest.sqlite3 # SQLite3 DB file as a template data source EXTRA_DIST += test1.zone.in EXTRA_DIST += test1-new.zone.in diff --git a/src/lib/datasrc/tests/testdata/rwtest.sqlite3 b/src/lib/testutils/testdata/auth_test.sqlite3 old mode 100644 new mode 100755 similarity index 100% rename from src/lib/datasrc/tests/testdata/rwtest.sqlite3 rename to src/lib/testutils/testdata/auth_test.sqlite3 diff --git a/src/lib/testutils/testdata/auth_test.sqlite3.copied b/src/lib/testutils/testdata/auth_test.sqlite3.copied new file mode 100755 index 0000000000000000000000000000000000000000..205e4ef54f2812d6be4314afc93bff7e9c637deb GIT binary patch literal 16384 zcmeI3%WvB@7{E!%kHvY^ZHnpO!-xSwBGd~Cbho1D)KnRasZyILKy#^~T1sNfmQ%^w znjHo>9d_R?yX+s>t-G%OL9xGL$9BMO!-`%;QnD?^j~bZc2F|CLdQcR}@AvWh_>i*m zz^u1@vfm1uZkyad8H6$Vj1Yv7N<)!`MH(a;KB7UUp}XPk$(W;xKKb+GEKPvrw=7vf zek=boCOzB&0zhCE1hUJtl!XtU#Zu6+&Z{WE9e}&{%b0;te1O$LUj{vv-%eZU#%nMX3#O$9= z`e6eCK;Qxri2MJSNPc+%g$I#=z}yh{6fYpGs?sW26FT|yaDSz^W9u7agIw?arRM*0 zLjnW=0zhCW0XF|n&j9%RAIASfSwSQan0o?j{GUTF5PE@c;~ynk`dNNHO`#v*oT6#? zxa~e}_)+c9Z@Sg5{V=Mx0`W@P+%|N_AdY^=G>CYQtS66lJUDF}gwflvfa_t)4i)-+tLBFM_M*fqp{GjGX;^nd^ zpm=jVaGQRaKB;wXF6I?Q!6&;s&u?3SAMssAc%Da*^}5%q-Tm##J$-wRd|~XB3CoT+ z#zTjb;+5XCO_Kq(>`i^gD3j2uHQXo~o2n=2TE$u`6EBD&zeeuZwrS{AKkGh^t)-lz zD!5t?JpU=LWA*Vds|-KCl!#EV?ivqC`Zlqx_?mDM+R2B@d8Jgs-^-jr=+|1I7bSb=w}{!?c<|&DIuyK^ivIL$Zfl#el%-^+EWQ1 zaKMS^3F71`FF+QPFw8w(Ofrqxe-_b~|8KB~f0v$1|H?n1KVlD%nSSejrY`W-{e#B! z>ecu6BfeV_bjqVfX_V-@j$N_n1NRKeDHlk0qqWXVY(5VzQOhmiFHeCC8I=T)Jc1-o zBcS9lTBDd(Zk2Fn`Ba`v!&Nu%s_D#&BQh5gi>2@uMJ<zlw2-;w5j7)R(0w*RdwDF?%4qphD+m7lK&P}8>= z$OHvTt(|07V|w*d4e`b93_-_Wl~-1$0y!g!~pP0IkL-I0JlOf%8Rxz5h$r|JncfEaKbfFZA84>NwjO^BD|Lr#*^>buYd$IXF+9*23cS zm$W8caiR;kqt{_3nfaf^f-SuNpOvqJa)7{lCou5-KeqqZNPhj^>jo770zlyG2wcsq Ns(8oN(;o!l{{WON#Uua# literal 0 HcmV?d00001 diff --git a/src/lib/testutils/testdata/rwtest.sqlite3 b/src/lib/testutils/testdata/rwtest.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..5eeb2c333e06972a72b5413b13e57522dc7e798c GIT binary patch literal 16384 zcmeI3&2Q5%6u|AKAFTW2L*&o{7TUz36@77dD?qE!oWxTt>>wHymY>y{l;eMV)Ci7OUbq|-)i>akm@<3fp5>_2C z)W-%V#Tz}B(KH5F&&;Kk)g*DPT*36bwo)}sZ>04bNn$ykXXnUlCZnk-yI6n6G|P(l*@&h73!6{R(WUZBqMnFjk;8;h0L-k+DFkxs6Qp} z1_$h`?j!cEVgh7Qgki4nVwx$;|09Tg`TrYh_)BO%^h^_f1splr}(bcx<74ITPxu zc~%h0BzL;wonzDVHpR|InmcIerDMA%$oz+MxK?ZbU%1pTz;NAY?`KWr=OY5t#$pE2 zN5Q0(-N@xCy?j$gydcnP+Y#H*J8r_N4mzbR+cnE{{yS#O=wPsM-THuWG}yElCJ1^f zPk%yZzvUYWeU#$(Gy3G`ovi~Hj89rhw;Z6`6A6r`{KYHyW#ep)r?CD%Tf-c*1_<<$ z0Qi3|X~VOCz}X_u@ckeApU)tkLEq8qUbV5eE9O&pMeX)mH0*ovoypd9YPU8PyT7H? z@s1PS$PM0y>15@98XLCE|FQG~(GLV500jD*z?d{4`~v_t%>VtZIcNt2fItg@zt;w) A-2eap literal 0 HcmV?d00001