Author: jelmer Date: 2007-08-04 18:16:18 +0000 (Sat, 04 Aug 2007) New Revision: 24218
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24218 Log: Use temporary locations rather than hard-coded ones. Modified: branches/4.0-regwrite/ branches/4.0-regwrite/source/lib/registry/tests/hive.c branches/4.0-regwrite/source/torture/util.c Changeset: Property changes on: branches/4.0-regwrite ___________________________________________________________________ Name: bzr:revision-info - timestamp: Wed 2007-06-13 01:46:37.009000063 +0200 committer: Jelmer Vernooij <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] + timestamp: Wed 2007-06-13 02:13:44.184000015 +0200 committer: Jelmer Vernooij <[EMAIL PROTECTED]> properties: branch-nick: 4.0-regwrite rebase-of: [EMAIL PROTECTED] Name: bzr:revision-id:v3-trunk0 - 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] 11150 [EMAIL PROTECTED] 11151 [EMAIL PROTECTED] 11152 [EMAIL PROTECTED] 11153 [EMAIL PROTECTED] 11154 [EMAIL PROTECTED] 11155 [EMAIL PROTECTED] 11156 [EMAIL PROTECTED] 11157 [EMAIL PROTECTED] 11158 [EMAIL PROTECTED] 11159 [EMAIL PROTECTED] 11160 [EMAIL PROTECTED] 11161 [EMAIL PROTECTED] 11162 [EMAIL PROTECTED] 11163 [EMAIL PROTECTED] 11164 [EMAIL PROTECTED] 11165 [EMAIL PROTECTED] 11166 [EMAIL PROTECTED] 11167 [EMAIL PROTECTED] 11168 [EMAIL PROTECTED] 11169 [EMAIL PROTECTED] 11170 [EMAIL PROTECTED] 11171 [EMAIL PROTECTED] 11172 [EMAIL PROTECTED] 11173 [EMAIL PROTECTED] 11174 [EMAIL PROTECTED] 11175 [EMAIL PROTECTED] 11176 [EMAIL PROTECTED] 11177 [EMAIL PROTECTED] 11178 [EMAIL PROTECTED] 11179 [EMAIL PROTECTED] 11180 [EMAIL PROTECTED] 11181 [EMAIL PROTECTED] 11182 [EMAIL PROTECTED] 11183 [EMAIL PROTECTED] 11184 [EMAIL PROTECTED] 11185 [EMAIL PROTECTED] 11186 [EMAIL PROTECTED] 11187 [EMAIL PROTECTED] 11188 [EMAIL PROTECTED] 11189 [EMAIL PROTECTED] 11190 [EMAIL PROTECTED] + 11140 [EMAIL PROTECTED] 11142 [EMAIL PROTECTED] 11143 [EMAIL PROTECTED] 11144 [EMAIL PROTECTED] 11145 [EMAIL PROTECTED] 11146 [EMAIL PROTECTED] 11147 [EMAIL PROTECTED] 11148 [EMAIL PROTECTED] 11149 [EMAIL PROTECTED] 11150 [EMAIL PROTECTED] 11151 [EMAIL PROTECTED] 11152 [EMAIL PROTECTED] 11153 [EMAIL PROTECTED] 11154 [EMAIL PROTECTED] 11155 [EMAIL PROTECTED] 11156 [EMAIL PROTECTED] 11157 [EMAIL PROTECTED] 11158 [EMAIL PROTECTED] 11159 [EMAIL PROTECTED] 11160 [EMAIL PROTECTED] 11161 [EMAIL PROTECTED] 11162 [EMAIL PROTECTED] 11163 [EMAIL PROTECTED] 11164 [EMAIL PROTECTED] 11165 [EMAIL PROTECTED] 11166 [EMAIL PROTECTED] 11167 [EMAIL PROTECTED] 11168 [EMAIL PROTECTED] 11169 [EMAIL PROTECTED] 11170 [EMAIL PROTECTED] 11171 [EMAIL PROTECTED] 11172 [EMAIL PROTECTED] 11173 [EMAIL PROTECTED] 11174 [EMAIL PROTECTED] 11175 [EMAIL PROTECTED] 11176 [EMAIL PROTECTED] 11177 [EMAIL PROTECTED] 11178 [EMAIL PROTECTED] 11179 [EMAIL PROTECTED] 11180 [EMAIL PROTECTED] 11181 [EMAIL PROTECTED] 11182 [EMAIL PROTECTED] 11183 [EMAIL PROTECTED] 11184 [EMAIL PROTECTED] 11185 [EMAIL PROTECTED] 11186 [EMAIL PROTECTED] 11187 [EMAIL PROTECTED] 11188 [EMAIL PROTECTED] 11189 [EMAIL PROTECTED] 11190 [EMAIL PROTECTED] 11191 [EMAIL PROTECTED] Modified: branches/4.0-regwrite/source/lib/registry/tests/hive.c =================================================================== --- branches/4.0-regwrite/source/lib/registry/tests/hive.c 2007-08-04 18:16:07 UTC (rev 24217) +++ branches/4.0-regwrite/source/lib/registry/tests/hive.c 2007-08-04 18:16:18 UTC (rev 24218) @@ -25,7 +25,11 @@ #include "lib/cmdline/popt_common.h" #include "torture/torture.h" #include "librpc/gen_ndr/winreg.h" +#include "system/filesys.h" +NTSTATUS torture_temp_dir(TALLOC_CTX *mem_ctx, const char *prefix, + const char **tempdir); + static bool test_del_nonexistant_key(struct torture_context *tctx, const void *test_data) { @@ -93,8 +97,16 @@ { struct hive_key *key; WERROR error; + const char *dirname; + NTSTATUS status; - error = reg_create_directory(tctx, "bla", &key); + status = torture_temp_dir(tctx, "hive-dir", &dirname); + if (!NT_STATUS_IS_OK(status)) + return false; + + rmdir(dirname); + + error = reg_create_directory(tctx, dirname, &key); if (!W_ERROR_IS_OK(error)) { fprintf(stderr, "Unable to initialize dir hive\n"); return false; @@ -109,8 +121,16 @@ { struct hive_key *key; WERROR error; + const char *dirname; + NTSTATUS status; - error = reg_open_ldb_file(tctx, "bla-ldb", NULL, NULL, &key); + status = torture_temp_dir(tctx, "hive-ldb", &dirname); + if (!NT_STATUS_IS_OK(status)) + return false; + + rmdir(dirname); + + error = reg_open_ldb_file(tctx, dirname, NULL, NULL, &key); if (!W_ERROR_IS_OK(error)) { fprintf(stderr, "Unable to initialize ldb hive\n"); return false; @@ -125,8 +145,16 @@ { struct hive_key *key; WERROR error; + const char *dirname; + NTSTATUS status; - error = reg_create_regf_file(tctx, "bla-regf", 5, &key); + status = torture_temp_dir(tctx, "hive-dir", &dirname); + if (!NT_STATUS_IS_OK(status)) + return false; + + rmdir(dirname); + + error = reg_create_regf_file(tctx, dirname, 5, &key); if (!W_ERROR_IS_OK(error)) { fprintf(stderr, "Unable to create new regf file\n"); return false; Modified: branches/4.0-regwrite/source/torture/util.c =================================================================== --- branches/4.0-regwrite/source/torture/util.c 2007-08-04 18:16:07 UTC (rev 24217) +++ branches/4.0-regwrite/source/torture/util.c 2007-08-04 18:16:18 UTC (rev 24218) @@ -29,16 +29,22 @@ create a temporary directory. */ _PUBLIC_ NTSTATUS torture_temp_dir(TALLOC_CTX *mem_ctx, const char *prefix, - char **tempdir) + const char **tempdir) { const char *basedir = lp_parm_string(-1, "torture", "basedir"); - if (basedir == NULL) basedir = "."; - *tempdir = talloc_asprintf(mem_ctx, "%s/%s.XXXXXX", + char *path; + + if (basedir == NULL) + basedir = "."; + + path = talloc_asprintf(mem_ctx, "%s/%s.XXXXXX", basedir, prefix); - if (mkdtemp(*tempdir) == NULL) + if (mkdtemp(path) == NULL) return NT_STATUS_UNSUCCESSFUL; + *tempdir = path; + return NT_STATUS_OK; }
