From 628ff090346e7f154bba2b606c88ce1d1c2067ee Mon Sep 17 00:00:00 2001 From: Tristan Youngs Date: Fri, 26 Aug 2016 16:51:14 +0100 Subject: [PATCH] Moved io_dlpoly test data, which had mistakenly been put into the io_dlputils directory, and added to Makefile.am as install target. --- Makefile.am | 38 +++++++++--------- .../io_dlpoly/ar-100-f-r.HISTORY | 0 .../io_dlpoly/ar-100-f.HISTORY | 0 .../io_dlpoly/ar-100-u-r.HISTORY | Bin .../io_dlpoly/ar-100-u.HISTORY | Bin .../{io_dlputils => }/io_dlpoly/ar-100.CONFIG | 0 .../io_dlpoly/ar-100.CONTROL | 0 .../{io_dlputils => }/io_dlpoly/ar-100.FIELD | 0 .../{io_dlputils => }/io_dlpoly/ar-100.REVCON | 0 .../{io_dlputils => }/io_dlpoly/bcc.CONFIG | 0 .../{io_dlputils => }/io_dlpoly/cross.pdens | 0 .../{io_dlputils => }/io_dlpoly/dmimcl.CONFIG | 0 .../io_dlpoly/emim-oac.CONFIG | 0 .../{io_dlputils => }/io_dlpoly/emim-oac.HISf | 0 .../{io_dlputils => }/io_dlpoly/fcc.CONFIG | 0 .../io_dlpoly/glucose.CONFIG | 0 .../io_dlpoly/water32.CONFIG | 0 .../io_dlpoly/water66-spcfw.CONFIG | 0 .../io_dlpoly/water66-spcfw.HISu | Bin 19 files changed, 20 insertions(+), 18 deletions(-) rename data/test/{io_dlputils => }/io_dlpoly/ar-100-f-r.HISTORY (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100-f.HISTORY (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100-u-r.HISTORY (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100-u.HISTORY (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100.CONTROL (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100.FIELD (100%) rename data/test/{io_dlputils => }/io_dlpoly/ar-100.REVCON (100%) rename data/test/{io_dlputils => }/io_dlpoly/bcc.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/cross.pdens (100%) rename data/test/{io_dlputils => }/io_dlpoly/dmimcl.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/emim-oac.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/emim-oac.HISf (100%) rename data/test/{io_dlputils => }/io_dlpoly/fcc.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/glucose.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/water32.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/water66-spcfw.CONFIG (100%) rename data/test/{io_dlputils => }/io_dlpoly/water66-spcfw.HISu (100%) diff --git a/Makefile.am b/Makefile.am index d4bff6e55..e5959e692 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,24 +30,26 @@ test04dir = $(testroot)/io_cif test04_DATA = data/test/io_cif/* test05dir = $(testroot)/io_csd test05_DATA = data/test/io_csd/* -test06dir = $(testroot)/io_dlputils -test06_DATA = data/test/io_dlputils/* -test07dir = $(testroot)/io_epsr -test07_DATA = data/test/io_epsr/* -test08dir = $(testroot)/io_gamess -test08_DATA = data/test/io_gamess/* -test09dir = $(testroot)/io_msi -test09_DATA = data/test/io_msi/* -test10dir = $(testroot)/io_pdb -test10_DATA = data/test/io_pdb/* -test11dir = $(testroot)/io_sybylmol2 -test11_DATA = data/test/io_sybylmol2/* -test12dir = $(testroot)/io_xyz -test12_DATA = data/test/io_xyz/* -test13dir = $(testroot)/render -test13_DATA = data/test/render/* -test14dir = $(testroot)/typing -test14_DATA = data/test/typing/* +test06dir = $(testroot)/io_dlpoly +test06_DATA = data/test/io_dlpoly/* +test07dir = $(testroot)/io_dlputils +test07_DATA = data/test/io_dlputils/* +test08dir = $(testroot)/io_epsr +test08_DATA = data/test/io_epsr/* +test09dir = $(testroot)/io_gamess +test09_DATA = data/test/io_gamess/* +test10dir = $(testroot)/io_msi +test10_DATA = data/test/io_msi/* +test11dir = $(testroot)/io_pdb +test11_DATA = data/test/io_pdb/* +test12dir = $(testroot)/io_sybylmol2 +test12_DATA = data/test/io_sybylmol2/* +test13dir = $(testroot)/io_xyz +test13_DATA = data/test/io_xyz/* +test14dir = $(testroot)/render +test14_DATA = data/test/render/* +test15dir = $(testroot)/typing +test15_DATA = data/test/typing/* ffdir = $(atendir)/ff ff_DATA = data/ff/* diff --git a/data/test/io_dlputils/io_dlpoly/ar-100-f-r.HISTORY b/data/test/io_dlpoly/ar-100-f-r.HISTORY similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100-f-r.HISTORY rename to data/test/io_dlpoly/ar-100-f-r.HISTORY diff --git a/data/test/io_dlputils/io_dlpoly/ar-100-f.HISTORY b/data/test/io_dlpoly/ar-100-f.HISTORY similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100-f.HISTORY rename to data/test/io_dlpoly/ar-100-f.HISTORY diff --git a/data/test/io_dlputils/io_dlpoly/ar-100-u-r.HISTORY b/data/test/io_dlpoly/ar-100-u-r.HISTORY similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100-u-r.HISTORY rename to data/test/io_dlpoly/ar-100-u-r.HISTORY diff --git a/data/test/io_dlputils/io_dlpoly/ar-100-u.HISTORY b/data/test/io_dlpoly/ar-100-u.HISTORY similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100-u.HISTORY rename to data/test/io_dlpoly/ar-100-u.HISTORY diff --git a/data/test/io_dlputils/io_dlpoly/ar-100.CONFIG b/data/test/io_dlpoly/ar-100.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100.CONFIG rename to data/test/io_dlpoly/ar-100.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/ar-100.CONTROL b/data/test/io_dlpoly/ar-100.CONTROL similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100.CONTROL rename to data/test/io_dlpoly/ar-100.CONTROL diff --git a/data/test/io_dlputils/io_dlpoly/ar-100.FIELD b/data/test/io_dlpoly/ar-100.FIELD similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100.FIELD rename to data/test/io_dlpoly/ar-100.FIELD diff --git a/data/test/io_dlputils/io_dlpoly/ar-100.REVCON b/data/test/io_dlpoly/ar-100.REVCON similarity index 100% rename from data/test/io_dlputils/io_dlpoly/ar-100.REVCON rename to data/test/io_dlpoly/ar-100.REVCON diff --git a/data/test/io_dlputils/io_dlpoly/bcc.CONFIG b/data/test/io_dlpoly/bcc.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/bcc.CONFIG rename to data/test/io_dlpoly/bcc.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/cross.pdens b/data/test/io_dlpoly/cross.pdens similarity index 100% rename from data/test/io_dlputils/io_dlpoly/cross.pdens rename to data/test/io_dlpoly/cross.pdens diff --git a/data/test/io_dlputils/io_dlpoly/dmimcl.CONFIG b/data/test/io_dlpoly/dmimcl.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/dmimcl.CONFIG rename to data/test/io_dlpoly/dmimcl.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/emim-oac.CONFIG b/data/test/io_dlpoly/emim-oac.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/emim-oac.CONFIG rename to data/test/io_dlpoly/emim-oac.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/emim-oac.HISf b/data/test/io_dlpoly/emim-oac.HISf similarity index 100% rename from data/test/io_dlputils/io_dlpoly/emim-oac.HISf rename to data/test/io_dlpoly/emim-oac.HISf diff --git a/data/test/io_dlputils/io_dlpoly/fcc.CONFIG b/data/test/io_dlpoly/fcc.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/fcc.CONFIG rename to data/test/io_dlpoly/fcc.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/glucose.CONFIG b/data/test/io_dlpoly/glucose.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/glucose.CONFIG rename to data/test/io_dlpoly/glucose.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/water32.CONFIG b/data/test/io_dlpoly/water32.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/water32.CONFIG rename to data/test/io_dlpoly/water32.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/water66-spcfw.CONFIG b/data/test/io_dlpoly/water66-spcfw.CONFIG similarity index 100% rename from data/test/io_dlputils/io_dlpoly/water66-spcfw.CONFIG rename to data/test/io_dlpoly/water66-spcfw.CONFIG diff --git a/data/test/io_dlputils/io_dlpoly/water66-spcfw.HISu b/data/test/io_dlpoly/water66-spcfw.HISu similarity index 100% rename from data/test/io_dlputils/io_dlpoly/water66-spcfw.HISu rename to data/test/io_dlpoly/water66-spcfw.HISu